diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-11 23:58:34 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-11 23:58:34 +0200 |
| commit | 9692e74b04eacf7a46f65df8db3eef34e695dba9 (patch) | |
| tree | 3f9fbbb318fd90987e5f5b3f1e59683113cc3c4a /ext/openssl/openssl.c | |
| parent | 163f51a4cfc50f872dc5df42a4b3c12ae921764a (diff) | |
| parent | 5d3cf577aad15b119c137a873f468c0614f2eb2e (diff) | |
| download | php-git-9692e74b04eacf7a46f65df8db3eef34e695dba9.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index d6094e7f11..c79447097d 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3217,7 +3217,7 @@ static EVP_PKEY * php_openssl_evp_from_zval(zval * val, int public_key, char * p if (Z_TYPE_P(zphrase) == IS_STRING) { passphrase = Z_STRVAL_P(zphrase); } else { - ZVAL_DUP(&tmp, zphrase); + ZVAL_COPY(&tmp, zphrase); convert_to_string(&tmp); passphrase = Z_STRVAL(tmp); } |