commit c4bd067359b07f6a57adf9d444d2a46e514043ff Author: Nick Mathewson <nickm@torproject.org> Date: Fri Mar 25 15:44:02 2011 -0400 Comment out ancient asserts for bug 930; resolve an xxx021 --- src/common/memarea.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/memarea.c b/src/common/memarea.c index 6893639..a6b8c4e 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -59,7 +59,9 @@ realign_pointer(void *ptr) { uintptr_t x = (uintptr_t)ptr; x = (x+MEMAREA_ALIGN_MASK) & ~MEMAREA_ALIGN_MASK; - tor_assert(((void*)x) >= ptr); // XXXX021 remove this once bug 930 is solved + /* Reinstate this if bug 930 ever reappears + tor_assert(((void*)x) >= ptr); + */ return (void*)x; } @@ -241,9 +243,10 @@ memarea_alloc(memarea_t *area, size_t sz) } result = chunk->next_mem; chunk->next_mem = chunk->next_mem + sz; - // XXXX021 remove these once bug 930 is solved. + /* Reinstate these if bug 930 ever comes back tor_assert(chunk->next_mem >= chunk->u.mem); tor_assert(chunk->next_mem <= chunk->u.mem+chunk->mem_size); + */ chunk->next_mem = realign_pointer(chunk->next_mem); return result; }