apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1460366 - in /apr/apr-util/branches/1.5.x: ./ CHANGES hooks/apr_hooks.c
Date Sun, 24 Mar 2013 13:30:43 GMT
Author: sf
Date: Sun Mar 24 13:30:42 2013
New Revision: 1460366

URL: http://svn.apache.org/r1460366
Log:
Merge r1127053, add CHANGES:

    Fix memory leak in hook sorting function

    PR: 51256
    Submitted by: <horowity checkpoint com>

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/hooks/apr_hooks.c

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

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1460366&r1=1460365&r2=1460366&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Sun Mar 24 13:30:42 2013
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.2
 
+  *) Fix memory leak in hook sorting function. PR 51256.
+     [<horowity checkpoint com>]
+
   *) Speedup md5 calculation by avoiding some copying on little endian
      architectures. PR 49011. [Stefan Fritsch, Stefan Fuhrmann
      <stefanfuhrmann alice-dsl de>]

Modified: apr/apr-util/branches/1.5.x/hooks/apr_hooks.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/hooks/apr_hooks.c?rev=1460366&r1=1460365&r2=1460366&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/hooks/apr_hooks.c (original)
+++ apr/apr-util/branches/1.5.x/hooks/apr_hooks.c Sun Mar 24 13:30:42 2013
@@ -208,6 +208,10 @@ static apr_array_header_t *sort_hook(apr
     }
     if(apr_hook_debug_enabled)
 	fputc('\n',stdout);
+
+    /* destroy the pool - the sorted hooks were already copied */
+    apr_pool_destroy(p);
+
     return pNew;
 }
 



Mime
View raw message