From: Jim Jagielski <jim@apache.org>
Date: Tue, 28 Feb 2012 12:07:31 +0000 (+0000)
Subject: Merge r1294471 from trunk:
X-Git-Tag: 2.4.2~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b9571d9106d0442efd3c7c08e29f839602fb85b;p=apache

Merge r1294471 from trunk:

properly free the GENERAL_NAMEs, as pointed out in PR 32652

Submitted by: kbrand
Reviewed/backported by: jim


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

diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index 13362bee29..48b561dc3b 100644
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -325,7 +325,7 @@ BOOL SSL_X509_getIDs(apr_pool_t *p, X509 *x509, apr_array_header_t **ids)
     }
 
     if (names)
-        sk_GENERAL_NAME_free(names);
+        sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
 
     /* Second, the CN-IDs (commonName attributes in the subject DN) */
     subj = X509_get_subject_name(x509);