archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix wrong merge
This commit is contained in:
Niels Dossche 2024-11-09 11:49:25 +01:00
commit cc54e66ad8
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/openssl/openssl.c
View file

@ -3693,7 +3693,7 @@ static EVP_PKEY *php_openssl_pkey_from_zval(
/* it's an X509 file/cert of some kind, and we need to extract the data from that */ /* it's an X509 file/cert of some kind, and we need to extract the data from that */
if (public_key) { if (public_key) {
php_openssl_errors_set_mark(); php_openssl_errors_set_mark();
cert = php_openssl_x509_from_str(Z_STR_P(val), arg_num, false, NULL); cert = php_openssl_x509_from_str(val_str, arg_num, false, NULL);
if (cert) { if (cert) {
free_cert = 1; free_cert = 1;