apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1460341 - in /apr/apr-util/branches/1.5.x: ./ buckets/apr_buckets_alloc.c
Date Sun, 24 Mar 2013 12:39:03 GMT
Author: sf
Date: Sun Mar 24 12:39:03 2013
New Revision: 1460341

URL: http://svn.apache.org/r1460341
Log:
Merge r1438960:

    Don't corrupt the bucket allocator in out-of-mem situation


Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/buckets/apr_buckets_alloc.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1438960

Modified: apr/apr-util/branches/1.5.x/buckets/apr_buckets_alloc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/buckets/apr_buckets_alloc.c?rev=1460341&r1=1460340&r2=1460341&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/buckets/apr_buckets_alloc.c (original)
+++ apr/apr-util/branches/1.5.x/buckets/apr_buckets_alloc.c Sun Mar 24 12:39:03 2013
@@ -131,6 +131,7 @@ APU_DECLARE_NONSTD(void *) apr_bucket_al
             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;



Mime
View raw message