php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix memory leaks when sk_X509_new_null() fails
This commit is contained in:
Niels Dossche
2026-01-22 22:47:35 +01:00
parent 6d02e51acb 7754eafb1f
commit 7d4e430435
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -36,6 +36,9 @@ PHP NEWS
. Fixed bug GH-20818 (Segfault in Tracing JIT with object reference).
(khasinski)
- OpenSSL:
. Fix memory leaks when sk_X509_new_null() fails. (ndossche)
- Phar:
. Fixed bug GH-20882 (buildFromIterator breaks with missing base directory).
(ndossche)

6
ext/openssl/openssl.c
View File

@@ -2616,6 +2616,9 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
}
recipcerts = sk_X509_new_null();
if (recipcerts == NULL) {
goto clean_exit;
}
/* get certs */
if (Z_TYPE_P(zrecipcerts) == IS_ARRAY) {
@@ -3230,6 +3233,9 @@ PHP_FUNCTION(openssl_cms_encrypt)
}
recipcerts = sk_X509_new_null();
if (recipcerts == NULL) {
goto clean_exit;
}
/* get certs */
if (Z_TYPE_P(zrecipcerts) == IS_ARRAY) {

3
ext/openssl/openssl_backend_common.c
View File

@@ -864,6 +864,9 @@ STACK_OF(X509) *php_openssl_array_to_X509_sk(zval * zcerts, uint32_t arg_num, co
bool free_cert;
sk = sk_X509_new_null();
if (sk == NULL) {
goto clean_exit;
}
/* get certs */
if (Z_TYPE_P(zcerts) == IS_ARRAY) {