Merge branch 'PHP-7.1' into PHP-7.2

m0003r · Oct 12, 2017 · ee36507 · ee36507
2 parents 8147382 + f8ff4c4
commit ee36507
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/NEWS b/NEWS
@@ -9,6 +9,9 @@ PHP                                                                        NEWS
   . Fixed bug #75301 (Exif extension has built in revision version). (Peter
     Kokot)
 
+- Openssl:
+  . Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob)
+
 - Zlib:
   . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
     Villepinte)

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -2294,7 +2294,6 @@ PHP_FUNCTION(openssl_x509_parse)
 {
 	zval * zcert;
 	X509 * cert = NULL;
-	zend_resource *certresource = NULL;
 	int i, sig_nid;
 	zend_bool useshortnames = 1;
 	char * tmpstr;
@@ -2314,7 +2313,7 @@ PHP_FUNCTION(openssl_x509_parse)
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &zcert, &useshortnames) == FAILURE) {
 		return;
 	}
-	cert = php_openssl_x509_from_zval(zcert, 0, &certresource);
+	cert = php_openssl_x509_from_zval(zcert, 0, NULL);
 	if (cert == NULL) {
 		RETURN_FALSE;
 	}
@@ -2430,9 +2429,6 @@ PHP_FUNCTION(openssl_x509_parse)
 				add_assoc_stringl(&subitem, extname, bio_buf->data, bio_buf->length);
 			} else {
 				zval_dtor(return_value);
-				if (certresource == NULL && cert) {
-					X509_free(cert);
-				}
 				BIO_free(bio_out);
 				RETURN_FALSE;
 			}
@@ -2446,10 +2442,6 @@ PHP_FUNCTION(openssl_x509_parse)
 		BIO_free(bio_out);
 	}
 	add_assoc_zval(return_value, "extensions", &subitem);
-
-	if (certresource == NULL && cert) {
-		X509_free(cert);
-	}
 }
 /* }}} */