[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r14322: Oops. Fix one last memarea freelist bug. (in tor/trunk: . src/common)
Author: nickm
Date: 2008-04-08 14:04:05 -0400 (Tue, 08 Apr 2008)
New Revision: 14322
Modified:
tor/trunk/
tor/trunk/src/common/memarea.c
Log:
r19249@catbus: nickm | 2008-04-08 14:04:02 -0400
Oops. Fix one last memarea freelist bug.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r19249] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/common/memarea.c
===================================================================
--- tor/trunk/src/common/memarea.c 2008-04-08 17:50:03 UTC (rev 14321)
+++ tor/trunk/src/common/memarea.c 2008-04-08 18:04:05 UTC (rev 14322)
@@ -177,7 +177,7 @@
char *result;
tor_assert(chunk);
if (chunk->next_mem+sz > chunk->u.mem+chunk->mem_size) {
- if (sz+CHUNK_HEADER_SIZE >= area->chunk_size) {
+ if (sz+CHUNK_HEADER_SIZE >= CHUNK_SIZE) {
/* This allocation is too big. Stick it in a special chunk, and put
* that chunk second in the list. */
memarea_chunk_t *new_chunk = alloc_chunk(sz+CHUNK_HEADER_SIZE, 0);