Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 44813 invoked from network); 22 Sep 2009 21:58:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Sep 2009 21:58:13 -0000 Received: (qmail 41147 invoked by uid 500); 22 Sep 2009 21:58:13 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 41082 invoked by uid 500); 22 Sep 2009 21:58:12 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 41071 invoked by uid 99); 22 Sep 2009 21:58:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2009 21:58:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2009 21:58:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 13D3B2388892; Tue, 22 Sep 2009 21:57:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r817860 - /apr/apr/branches/1.3.x/tables/apr_hash.c Date: Tue, 22 Sep 2009 21:57:38 -0000 To: commits@apr.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090922215740.13D3B2388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Tue Sep 22 21:57:36 2009 New Revision: 817860 URL: http://svn.apache.org/viewvc?rev=817860&view=rev Log: Merge r817858 from trunk: * Use the correct pool. ht->pool isn't set to pool yet. Submitted by: Neil Conway Reviewed by: rpluem Modified: apr/apr/branches/1.3.x/tables/apr_hash.c Modified: apr/apr/branches/1.3.x/tables/apr_hash.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/tables/apr_hash.c?rev=817860&r1=817859&r2=817860&view=diff ============================================================================== --- apr/apr/branches/1.3.x/tables/apr_hash.c (original) +++ apr/apr/branches/1.3.x/tables/apr_hash.c Tue Sep 22 21:57:36 2009 @@ -311,7 +311,7 @@ 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) +