support: Do not use free for memory allocated in a pool (regression introduced in...

trunk patch: http://svn.apache.org/r1490507
Submitted by: jailletc36
Reviewed by: fuankg, minfrin

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

diff --git a/STATUS b/STATUS
index 4e99c4690c37c6dc597f3eb94a3e2ebbc34d6935..dba8da4ce4ac938e813dbb3c7bdc70948d31f70d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -131,10 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  half of all new stuff, and therefore the +0.5 - I would like
                  to have someone else add a vote too.
 
-    * support: Do not use free for memory allocated in a pool (regression introduced in r1476674)
-      trunk patch: http://svn.apache.org/r1490507
-      2.4.x patch: trunk works
-      +1 jailletc36, fuankg, minfrin
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/support/passwd_common.c b/support/passwd_common.c
index c03242be2f77e88c0ed8718a4bb4e64fa9d891f5..395dc934505bb0cd50899737ec3de8abb438afc4 100644 (file)
--- a/support/passwd_common.c
+++ b/support/passwd_common.c
@@ -238,7 +238,6 @@ int mkhash(struct passwd_ctx *ctx)
                                 "characters by CRYPT algorithm." NL);
             }
             memset(truncpw, '\0', strlen(pw));
-            free(truncpw);
         }
         break;
 #endif /* CRYPT_ALGO_SUPPORTED */