nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add some asserts to try to catch bug 930

Browse Source 
svn:r19074
This commit is contained in:
Nick Mathewson 2009-03-18 15:12:56 +00:00
parent 30ec1d1d50
commit cb3b95de19
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/memarea.c
View File

@ -31,6 +31,7 @@ realign_pointer(void *ptr)
{ {
uintptr_t x = (uintptr_t)ptr; uintptr_t x = (uintptr_t)ptr;
x = (x+MEMAREA_ALIGN_MASK) & ~MEMAREA_ALIGN_MASK; x = (x+MEMAREA_ALIGN_MASK) & ~MEMAREA_ALIGN_MASK;
tor_assert(((void*)x) >= ptr); // XXXX021 remove this once bug 930 is solved
return (void*)x; return (void*)x;
} }
@ -84,6 +85,8 @@ alloc_chunk(size_t sz, int freelist_ok)
res->next_chunk = NULL; res->next_chunk = NULL;
res->mem_size = chunk_size - CHUNK_HEADER_SIZE; res->mem_size = chunk_size - CHUNK_HEADER_SIZE;
res->next_mem = res->u.mem; res->next_mem = res->u.mem;
tor_assert(res->next_mem+res->mem_size == ((char*)res)+chunk_size);
tor_assert(realign_pointer(res->next_mem) == res->next_mem);
return res; return res;
} }
} }
@ -196,6 +199,9 @@ memarea_alloc(memarea_t *area, size_t sz)
} }
result = chunk->next_mem; result = chunk->next_mem;
chunk->next_mem = realign_pointer(chunk->next_mem + sz); chunk->next_mem = realign_pointer(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);
return result; return result;
} }