You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/02/28 13:07:31 UTC

svn commit: r1294602 - /httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c

Author: jim
Date: Tue Feb 28 12:07:31 2012
New Revision: 1294602

URL: http://svn.apache.org/viewvc?rev=1294602&view=rev
Log:
Merge r1294471 from trunk:

properly free the GENERAL_NAMEs, as pointed out in PR 32652

Submitted by: kbrand
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c?rev=1294602&r1=1294601&r2=1294602&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c Tue Feb 28 12:07:31 2012
@@ -325,7 +325,7 @@ BOOL SSL_X509_getIDs(apr_pool_t *p, X509
     }
 
     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);