Changeset 1333 for pjproject/trunk/pjlib/src/pj/pool_policy_new.cpp

Timestamp:

Jun 1, 2007 7:26:21 AM (17 years ago)

Author:

bennylp

Message:

Implement ticket #314: Added PJ_SAFE_POOL configuration in PJLIB to track down memory corruptions

File:

• pjproject/trunk/pjlib/src/pj/pool_policy_new.cpp (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/pool_policy_new.cpp

@@ -26 +26 @@
  * This file contains pool default policy definition and implementation.
  */
+#include "pool_signature.h"
  
 
 static void *operator_new(pj_pool_factory *factory, pj_size_t size)
 {
+    void *mem;
+
     PJ_CHECK_STACK();
     PJ_UNUSED_ARG(factory);
     PJ_UNUSED_ARG(size);
 
-    return new char[size];
+    mem = (void*) new char[size+(SIG_SIZE << 1)];
+    
+    /* Exception for new operator may be disabled, so.. */
+    if (mem) {
+        /* Apply signature when PJ_SAFE_POOL is set. It will move
+         * "mem" pointer forward.
+         */
+        APPLY_SIG(mem, size);
+    }
+
+    return mem;
 }
 
@@ -42 +55 @@
     PJ_UNUSED_ARG(factory);
     PJ_UNUSED_ARG(size);
+
+    /* Check and remove signature when PJ_SAFE_POOL is set. It will
+     * move "mem" pointer backward.
+     */
+    REMOVE_SIG(mem, size);
+
+    /* Note that when PJ_SAFE_POOL is set, the actual size of the block
+     * is size + SIG_SIZE*2.
+     */
 
     char *p = (char*)mem;