Skip to content

Commit ef1e186

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix wrong merge
2 parents fd68e9b + 80dd5a0 commit ef1e186

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/openssl/openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3693,7 +3693,7 @@ static EVP_PKEY *php_openssl_pkey_from_zval(
36933693
/* it's an X509 file/cert of some kind, and we need to extract the data from that */
36943694
if (public_key) {
36953695
php_openssl_errors_set_mark();
3696-
cert = php_openssl_x509_from_str(Z_STR_P(val), arg_num, false, NULL);
3696+
cert = php_openssl_x509_from_str(val_str, arg_num, false, NULL);
36973697

36983698
if (cert) {
36993699
free_cert = 1;

0 commit comments

Comments
 (0)