Fix the fix...

apr_allocator_destroy wasn't the one using the invalid lock, it was
apr_allocator_free, which was being called a few lines above my
previous fix.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63157 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 7 deletions

diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 8ef86debc..a0b48025d 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -677,6 +677,15 @@ APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool)
     allocator = pool->allocator;
     active = pool->self;
 
+#if APR_HAS_THREADS
+    if (apr_allocator_get_owner(allocator) == pool) {
+        /* Make sure to remove the lock, since it is highly likely to
+         * be invalid now.
+         */
+        apr_allocator_set_mutex(allocator, NULL);
+    }
+#endif /* APR_HAS_THREADS */
+
     /* Free all the nodes in the pool (including the node holding the
      * pool struct), by giving them back to the allocator.
      */
@@ -688,13 +697,6 @@ APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool)
      * in the allocator, it will have been destroyed by the cleanup function.
      */
     if (apr_allocator_get_owner(allocator) == pool) {
-#if APR_HAS_THREADS
-        /* Make sure to remove the lock, since it is highly likely to
-         * be invalid now.
-         */
-        apr_allocator_set_mutex(allocator, NULL);
-#endif /* APR_HAS_THREADS */
-
         apr_allocator_destroy(allocator);
     }
 }