diff options
| author | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2013-03-24 12:39:03 +0000 |
|---|---|---|
| committer | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2013-03-24 12:39:03 +0000 |
| commit | be7c1e258c328bc57e8ff8879188d6cbae325c8e (patch) | |
| tree | 3684bcdd442e3976ef243bd7facd5a2c307c0a81 | |
| parent | 3d046c017ce1b27f03d75f56c142239058587a61 (diff) | |
| download | libapr-util-be7c1e258c328bc57e8ff8879188d6cbae325c8e.tar.gz | |
Merge r1438960:
Don't corrupt the bucket allocator in out-of-mem situation
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1460341 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | buckets/apr_buckets_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/buckets/apr_buckets_alloc.c b/buckets/apr_buckets_alloc.c index 60f42dea..d1425440 100644 --- a/buckets/apr_buckets_alloc.c +++ b/buckets/apr_buckets_alloc.c @@ -131,6 +131,7 @@ APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size, if (endp >= active->endp) { list->blocks = apr_allocator_alloc(list->allocator, ALLOC_AMT); if (!list->blocks) { + list->blocks = active; return NULL; } list->blocks->next = active; |