Fix PKCS12 leak in openssl

nikic · nikic · commit 99f3e0f0ed66 · 2019-06-21T15:07:37.000+02:00
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -3029,8 +3029,6 @@ PHP_FUNCTION(openssl_pkcs12_read)
 		}
 
 		RETVAL_TRUE;
-
-		PKCS12_free(p12);
 	} else {
 		php_openssl_store_errors();
 	}
@@ -3045,6 +3043,9 @@ PHP_FUNCTION(openssl_pkcs12_read)
 	if (cert) {
 		X509_free(cert);
 	}
+	if (p12) {
+		PKCS12_free(p12);
+	}
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -3029,8 +3029,6 @@ PHP_FUNCTION(openssl_pkcs12_read)`
`3029`	`3029`	`}`
`3030`	`3030`
`3031`	`3031`	`RETVAL_TRUE;`
`3032`		`-`
`3033`		`- PKCS12_free(p12);`
`3034`	`3032`	`} else {`
`3035`	`3033`	`php_openssl_store_errors();`
`3036`	`3034`	`}`
`@@ -3045,6 +3043,9 @@ PHP_FUNCTION(openssl_pkcs12_read)`
`3045`	`3043`	`if (cert) {`
`3046`	`3044`	`X509_free(cert);`
`3047`	`3045`	`}`
	`3046`	`+ if (p12) {`
	`3047`	`+ PKCS12_free(p12);`
	`3048`	`+ }`
`3048`	`3049`	`}`
`3049`	`3050`	`/* }}} */`
`3050`	`3051`