Changeset 2963 for pjproject/trunk

Timestamp:

Oct 24, 2009 2:06:40 AM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #980: Memory pool alignment error when alignment is set to be greater than 4 bytes (thanks John Ridges for the report)

File:

• pjproject/trunk/pjlib/src/pj/pool.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/pool.c

@@ -67 +67 @@
     pool->capacity += size;
 
-    /* Set block attribytes. */
-    block->cur = block->buf = ((unsigned char*)block) + sizeof(pj_pool_block);
+    /* Set start and end of buffer. */
+    block->buf = ((unsigned char*)block) + sizeof(pj_pool_block);
     block->end = ((unsigned char*)block) + size;
+
+    /* Set the start pointer, aligning it as needed */
+    block->cur = (unsigned char*)
+                 (((unsigned long)block->buf + PJ_POOL_ALIGNMENT - 1) & 
+                  ~(PJ_POOL_ALIGNMENT - 1));
 
     /* Insert in the front of the list. */
@@ -112 +117 @@
     /* If pool is configured to expand, but the increment size
      * is less than the required size, expand the pool by multiple
-     * increment size
+     * increment size. Also count the size wasted due to aligning
+     * the block.
      */
-    if (pool->increment_size < size + sizeof(pj_pool_block)) {
+    if (pool->increment_size < 
+            size + sizeof(pj_pool_block) + PJ_POOL_ALIGNMENT) 
+    {
         unsigned count;
-        count = (size + pool->increment_size + sizeof(pj_pool_block)) / 
+        count = (size + pool->increment_size + sizeof(pj_pool_block) +
+                 PJ_POOL_ALIGNMENT) / 
                 pool->increment_size;
         block_size = count * pool->increment_size;