summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68>2009-09-22 21:57:36 +0000
committerrpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68>2009-09-22 21:57:36 +0000
commitbd9ab1fc778ba72ed6dfebdcaafb088003fa861a (patch)
tree68887d1b8587e89431268b06e590d37b42514ee7
parent0ade05af45a20e03acecad9436dcbeb75102a1f0 (diff)
downloadlibapr-bd9ab1fc778ba72ed6dfebdcaafb088003fa861a.tar.gz
Merge r817858 from trunk:
* Use the correct pool. ht->pool isn't set to pool yet. Submitted by: Neil Conway <nrc cs.berkeley.edu> Reviewed by: rpluem git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@817860 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--tables/apr_hash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tables/apr_hash.c b/tables/apr_hash.c
index e6e801f4b..7db486f7a 100644
--- a/tables/apr_hash.c
+++ b/tables/apr_hash.c
@@ -311,7 +311,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_copy(apr_pool_t *pool,
apr_hash_entry_t *new_vals;
unsigned int i, j;
- if (apr_pool_create(&array_pool, ht->pool) != APR_SUCCESS)
+ if (apr_pool_create(&array_pool, pool) != APR_SUCCESS)
return NULL;
ht = apr_palloc(pool, sizeof(apr_hash_t) +