From 80dd5a0306b5709de8a57d339d464b0e15ac6f9d Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sat, 9 Nov 2024 11:49:08 +0100 Subject: [PATCH] Fix wrong merge --- ext/openssl/openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index fd714ea5bf4..c5720ee97e3 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3635,7 +3635,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 */ if (public_key) { 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) { free_cert = 1;