php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify callers of zval_try_get_long() (#18830)

Browse Source 
Since 2b383848 references are handled properly by the Zend API, so we
can simplify the callers by removing reference handling from there.
This commit is contained in:
Niels Dossche
2025-06-12 17:49:22 +02:00
committed by GitHub
parent def3a95b14
commit 029a78813d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/curl/share.c
View File

@@ -160,9 +160,7 @@ PHP_FUNCTION(curl_share_init_persistent)
}
ZEND_HASH_FOREACH_VAL(share_opts, zval *entry) {
ZVAL_DEREF(entry);
bool failed = false;
bool failed;
zend_ulong option = zval_try_get_long(entry, &failed);
if (failed) {

8
ext/zip/php_zip.c
View File

@@ -3037,13 +3037,11 @@ static int php_zip_cancel_callback(zip_t *arch, void *ptr)
/* Cancel if an exception has been thrown */
return -1;
}
bool failed = false;
zval *cb_retval_ptr = &cb_retval;
ZVAL_DEREF(cb_retval_ptr);
zend_long retval = zval_try_get_long(cb_retval_ptr, &failed);
bool failed;
zend_long retval = zval_try_get_long(&cb_retval, &failed);
if (failed) {
zend_type_error("Return value of callback provided to ZipArchive::registerCancelCallback()"
" must be of type int, %s returned", zend_zval_value_name(cb_retval_ptr));
" must be of type int, %s returned", zend_zval_value_name(&cb_retval));
zval_ptr_dtor(&cb_retval);
return -1;
}