Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 25735 invoked from network); 11 Mar 2005 20:44:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Mar 2005 20:44:38 -0000 Received: (qmail 30961 invoked by uid 500); 11 Mar 2005 20:44:38 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 30905 invoked by uid 500); 11 Mar 2005 20:44:37 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list commits@apr.apache.org Received: (qmail 30886 invoked by uid 99); 11 Mar 2005 20:44:37 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 11 Mar 2005 12:44:37 -0800 Received: (qmail 25719 invoked by uid 65534); 11 Mar 2005 20:44:35 -0000 Message-ID: <20050311204435.25716.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 11 Mar 2005 20:44:35 -0000 Subject: svn commit: r157152 - apr/apr-util/branches/0.9.x/buckets/apr_buckets_alloc.c To: commits@apr.apache.org From: jwoolley@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jwoolley Date: Fri Mar 11 12:44:34 2005 New Revision: 157152 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157152 Log: backport from trunk: Fix memory leak when in APR_POOL_DEBUG mode Submitted by: Joe Schaefer Modified: apr/apr-util/branches/0.9.x/buckets/apr_buckets_alloc.c Modified: apr/apr-util/branches/0.9.x/buckets/apr_buckets_alloc.c URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/buckets/apr_= buckets_alloc.c?view=3Ddiff&r1=3D157151&r2=3D157152 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/branches/0.9.x/buckets/apr_buckets_alloc.c (original) +++ apr/apr-util/branches/0.9.x/buckets/apr_buckets_alloc.c Fri Mar 11 12:4= 4:34 2005 @@ -46,6 +46,13 @@ apr_bucket_alloc_t *list =3D data; =20 apr_allocator_free(list->allocator, list->blocks); + +#if APR_POOL_DEBUG + if (list->pool && list->allocator !=3D apr_pool_allocator_get(list->po= ol)) { + apr_allocator_destroy(list->allocator); + } +#endif + return APR_SUCCESS; } =20