diff options
| author | Joe Orton <jorton@apache.org> | 2006-03-10 07:32:33 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2006-03-10 07:32:33 +0000 |
| commit | a2291bb0ac25fdcb14fdad33485e2045758d4c49 (patch) | |
| tree | 5b23ffceddde9e23c55cf94e01a864ce1960fbcd /memory | |
| parent | f09ee4748baccb959bcb70238f3a9ea928fbabaf (diff) | |
| download | apr-a2291bb0ac25fdcb14fdad33485e2045758d4c49.tar.gz | |
* memory/unix/apr_pools.c (apr_pool_create_ex): Revert previous
change; add comment.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@384722 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memory')
| -rw-r--r-- | memory/unix/apr_pools.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index b2bd54a94..b4218fe11 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -791,7 +791,11 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool, if (!parent) parent = global_pool; - if (!abort_fn) + /* parent will always be non-NULL here except the first time a + * pool is created, in which case allocator is guaranteed to be + * non-NULL. */ + + if (!abort_fn && parent) abort_fn = parent->abort_fn; if (allocator == NULL) |