]> granicus.if.org Git - apache/commitdiff
Merge r1294471 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 28 Feb 2012 12:07:31 +0000 (12:07 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 28 Feb 2012 12:07:31 +0000 (12:07 +0000)
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

modules/ssl/ssl_util_ssl.c

index 13362bee297a05d2acc2838776641ae85c595907..48b561dc3b16df1b872845384f727ccf33d9eba4 100644 (file)
@@ -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);