Commit 513f129a92f for php.net
commit 513f129a92fb8746a7cf4e00416c2227bb2f549c
Merge: f75ad033ca7 1ef9aa7e32f
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Fri Apr 3 22:24:50 2026 +0200
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix crash in php_openssl_create_sni_server_ctx() when SSL_CTX_new() fails
Fix crash in openssl_pkcs12_read() when BIO_new() fails
Fix crash in openssl_pkey_export() when BIO_new() fails
Fix crash in openssl_digest() when EVP_MD_CTX_create() fails
diff --cc ext/openssl/openssl.c
index f43f09b3085,30ac08397ed..1cee9c30974
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -2234,9 -5058,10 +2238,10 @@@ PHP_FUNCTION(openssl_pkey_export
php_openssl_store_errors();
}
}
+ cleanup:
- PHP_SSL_REQ_DISPOSE(&req);
EVP_PKEY_free(key);
BIO_free(bio_out);
+ PHP_SSL_REQ_DISPOSE(&req);
}
/* }}} */