Changeset 953 for pjproject/trunk/pjlib/src/pj/pool_buf.c

Timestamp:

Feb 16, 2007 9:44:36 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #105: unnecessary assert in fixed buffer based pool (pool_buf) on no memory condition

File:

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

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

@@ -54 +54 @@
 {
     struct creation_param *param;
+    void *buf;
 
     PJ_UNUSED_ARG(factory);
 
     param = pj_thread_local_get(tls);
-    PJ_ASSERT_RETURN(param != NULL, NULL);
+    if (param == NULL) {
+        /* Don't assert(), this is normal no-memory situation */
+        return NULL;
+    }
 
     pj_thread_local_set(tls, NULL);
@@ -64 +68 @@
     PJ_ASSERT_RETURN(size <= param->size, NULL);
 
-    return param->stack_buf;
+    buf = param->stack_buf;
+
+    /* Prevent the buffer from being reused */
+    param->stack_buf = NULL;
+
+    return buf;
 }