Re: svn commit: r677505 - /apr/apr-util/trunk/misc/apr_reslist.c

[Bojan Smojver]

On Sat, 2008-07-19 at 08:59 +1000, Bojan Smojver wrote:

> Does this solve it?

Eh, sorry - not being careful enough with that cleanup registration.
This should be better.

-- 
Bojan

Index: memcache/apr_memcache.c
===================================================================
--- memcache/apr_memcache.c	(revision 677819)
+++ memcache/apr_memcache.c	(working copy)
@@ -295,7 +295,15 @@
     return rv;
 }
 
+static apr_status_t conn_clean(void *data)
+{
+    apr_memcache_conn_t *conn = data;
 
+    conn->p = NULL; /* so that destructor does not destroy the pool again */
+
+    return APR_SUCCESS;
+}
+
 static apr_status_t
 mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
 {
@@ -310,7 +318,7 @@
         return rv;
     }
 
-    conn = apr_palloc(np, sizeof( apr_memcache_conn_t ));
+    conn = malloc(sizeof( apr_memcache_conn_t )); /* non-pool space! */
 
     conn->p = np;
 
@@ -334,8 +342,10 @@
     rv = conn_connect(conn);
     if (rv != APR_SUCCESS) {
         apr_pool_destroy(np);
+        free(conn);
     }
     else {
+        apr_pool_cleanup_register(np, conn, conn_clean, apr_pool_cleanup_null);
         *conn_ = conn;
     }
     
@@ -359,6 +369,12 @@
     /* Return values not checked, since we just want to make it go away. */
     apr_socket_sendv(conn->sock, vec, 2, &written);
     apr_socket_close(conn->sock);
+
+    if (conn->p) {
+        apr_pool_destroy(conn->p);
+    }
+
+    free(conn); /* free non-pool space */
     
     return APR_SUCCESS;
 }