diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-04 19:22:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-04 19:22:24 +0300 |
| commit | 4a475a4976db92e71949786cdf5990c61514261e (patch) | |
| tree | 6934c9e00200e6388256656b8fa71c97a1a3a158 /ext/openssl/openssl.c | |
| parent | d798fd491be77943fb751ad97d85475bf324192c (diff) | |
| download | php-git-4a475a4976db92e71949786cdf5990c61514261e.tar.gz | |
Replace legacy zval_dtor() by zval_ptr_dtor_nogc() or even more specialized destructors.
zval_dtor() doesn't make a lot of sense in PHP-7.* and it's used incorrectly in some places.
Its occurances should be replaced by zval_ptr_dtor() or zval_ptr_dtor_nogc(), or even more specialized destructors.
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 4aae81dbd7..ca7e512efd 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3730,7 +3730,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( #define TMP_CLEAN \ if (Z_TYPE(tmp) == IS_STRING) {\ - zval_dtor(&tmp); \ + zval_ptr_dtor_str(&tmp); \ } \ return NULL; @@ -3796,7 +3796,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( TMP_CLEAN; } else { if (Z_TYPE(tmp) == IS_STRING) { - zval_dtor(&tmp); + zval_ptr_dtor_str(&tmp); } /* got the key - return it */ return (EVP_PKEY*)what; @@ -3885,7 +3885,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( *resourceval = zend_register_resource(key, le_key); } if (Z_TYPE(tmp) == IS_STRING) { - zval_dtor(&tmp); + zval_ptr_dtor_str(&tmp); } return key; } |