r17660@tombo: nickm | 2008-08-06 12:22:19 -0400

 Backport: Fix bug 794: recover 3 bytes wasted per memory chunk.  Fix from rovv.

svn:r16449

diff --git a/ChangeLog b/ChangeLog
index 1c12fbe97e03f6344f14e2cf56ac9bc4686148d9..e8e0e37d9c0f7f6fe44e7afb55617bb249fddb94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Changes in version 0.2.0.31 - 2008-08-??
  o Minor bugfixes:
     - Fix a small alignment and memory-wasting bug on buffer chunks.  Spotted
       by rovv.
+    - Recover 3-7 bytes that were wasted per memory chunk.  Fixes bug
+      794; bug spotted by rovv.  Bugfix on 0.2.0.1-alpha.
 
 
 Changes in version 0.2.0.30 - 2008-07-15

diff --git a/src/common/mempool.c b/src/common/mempool.c
index 6a41d220fe8f35074e768347965e1073d37f3359..d489cf65508c45fa132c7bd01005e7960d40c23d 100644 (file)
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -144,7 +144,7 @@ struct mp_chunk_t {
 };
 
 /** Number of extra bytes needed beyond mem_size to allocate a chunk. */
-#define CHUNK_OVERHEAD (sizeof(mp_chunk_t)-1)
+#define CHUNK_OVERHEAD STRUCT_OFFSET(mp_chunk_t, mem[0])
 
 /** Given a pointer to a mp_allocated_t, return a pointer to the memory
  * item it holds. */