Merge r450070 from trunk:

Memory leak fix: Unconditionally free the buffer.

Submitted by: minfrin
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486661 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0aac81667de66e2974466ab4bc1110514ac20cfb..1268dd8b6a28559ee127cd105694f5f8c542f92d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
+     [Davi Arnaut <davi haxent.com.br>]
+
   *) Allow mod_dumpio to log at other than DEBUG levels via
      the new DumpIOLogLevel directive. [Jim Jagielski]
 

diff --git a/STATUS b/STATUS
index 9d2fef166ea35ccae6fa57bf386ab91552d5011f..b686cbb1191e37aeae371b571a3b475942c1ca03 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -78,11 +78,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
-      Trunk: http://svn.apache.org/viewvc?view=rev&revision=450070
-      +1: minfrin, jim, wrowe
-        wrowe asks; should ptr mobj->m be nulled out for safety's sake?
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.

diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c
index 824f8d7563a8aa6d72a12c2dd4df7e3550ea0e97..ea9c45d35692d12dd7d926ed55eb94357f930d09 100644 (file)
--- a/modules/cache/mod_mem_cache.c
+++ b/modules/cache/mod_mem_cache.c
@@ -206,7 +206,7 @@ static void cleanup_cache_object(cache_object_t *obj)
 
     /* Cleanup the mem_cache_object_t */
     if (mobj) {
-        if (mobj->type == CACHE_TYPE_HEAP && mobj->m) {
+        if (mobj->m) {
             free(mobj->m);
         }
         if (mobj->type == CACHE_TYPE_FILE && mobj->fd) {