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

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix crash in openssl_x509_parse() when X509_NAME_oneline() fails
  Fix crash when in openssl_x509_parse() when i2s_ASN1_INTEGER() fails
This commit is contained in:
Niels Dossche
2026-01-23 14:59:21 +01:00
parent 7d4e430435 62afc7a2fa
commit 2c08d9a627
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -38,6 +38,10 @@ PHP NEWS
- OpenSSL:
. Fix memory leaks when sk_X509_new_null() fails. (ndossche)
. Fix crash when in openssl_x509_parse() when i2s_ASN1_INTEGER() fails.
(ndossche)
. Fix crash in openssl_x509_parse() when X509_NAME_oneline() fails.
(ndossche)
- Phar:
. Fixed bug GH-20882 (buildFromIterator breaks with missing base directory).

11
ext/openssl/openssl.c
View File

@@ -1030,6 +1030,11 @@ PHP_FUNCTION(openssl_x509_parse)
subject_name = X509_get_subject_name(cert);
cert_name = X509_NAME_oneline(subject_name, NULL, 0);
if (cert_name == NULL) {
php_openssl_store_errors();
goto err;
}
add_assoc_string(return_value, "name", cert_name);
OPENSSL_free(cert_name);
@@ -1062,6 +1067,12 @@ PHP_FUNCTION(openssl_x509_parse)
}
str_serial = i2s_ASN1_INTEGER(NULL, asn1_serial);
/* Can return NULL on error or memory allocation failure */
if (!str_serial) {
php_openssl_store_errors();
goto err;
}
add_assoc_string(return_value, "serialNumber", str_serial);
OPENSSL_free(str_serial);