aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-10-15 12:46:55 -0400
committerNick Mathewson <nickm@torproject.org>2010-10-15 13:44:25 -0400
commit05274ba9b5f9ba1a7e4cae995ef699cfb019c15a (patch)
tree87d2a8c31c4e08acb6854080cb89c8f14e695836 /src/common
parentaab695288726084f48f815ebaec8f0abd675c926 (diff)
downloadtor-05274ba9b5f9ba1a7e4cae995ef699cfb019c15a.tar
tor-05274ba9b5f9ba1a7e4cae995ef699cfb019c15a.tar.gz
Kill comments saying to remove asserts once bug930 is solved.
It's okay to leave the asserts in: the code doesn't appear in profiles.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/memarea.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/memarea.c b/src/common/memarea.c
index 77579e63b..b5ac7ad97 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -53,7 +53,7 @@ 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
+ tor_assert(((void*)x) >= ptr);
return (void*)x;
}
@@ -230,9 +230,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.
+
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;
}