Simplified cleanup and adding test

Author: JarneClauw

ext/openssl/openssl.c

@@ -2847,6 +2847,7 @@ PHP_FUNCTION(openssl_pkcs12_read)
 
 		zout = zend_try_array_init(zout);
 		if (!zout) {
+			sk_X509_pop_free(ca, X509_free);
 			goto cleanup;
 		}
 
@@ -2898,7 +2899,6 @@ PHP_FUNCTION(openssl_pkcs12_read)
 			}
 
 			sk_X509_free(ca);
-			ca = NULL;
 			add_assoc_zval(zout, "extracerts", &zextracerts);
 		}
 
@@ -2916,15 +2916,6 @@ PHP_FUNCTION(openssl_pkcs12_read)
 	if (p12) {
 		PKCS12_free(p12);
 	}
-	int cert_num = sk_X509_num(ca);
-	if (ca && cert_num) {
-		for (i = 0; i < cert_num; i++) {
-			X509* aCA = sk_X509_pop(ca);
-			if (!aCA) break;
-			X509_free(aCA);
-		}
-		sk_X509_free(ca);
-	}
 }
 /* }}} */
 

ext/openssl/tests/openssl_pkcs12_read_array_init.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Memory leak when array initialization in openssl_pkcs12_read() fails
+--EXTENSIONS--
+openssl
+--FILE--
+<?php
+$pfx = __DIR__ . DIRECTORY_SEPARATOR . "bug74022.pfx";
+$cert_store = file_get_contents($pfx);
+
+class Typed {
+    public string $foo = "bar";
+}
+
+$typed = new Typed;
+
+try {
+    openssl_pkcs12_read($cert_store, $typed->foo, "csos");
+} catch (TypeError $e) {
+    echo $e::class, ": ", $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+TypeError: Cannot assign array to reference held by property Typed::$foo of type string