mirror of
https://github.com/php/php-src.git
synced 2024-11-23 01:44:06 +08:00
Fix wrong merge
This commit is contained in:
parent
591fe92724
commit
80dd5a0306
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user