clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some redundant uses of HASH_OF

Browse Source 
GET etc are always arrays, they cannot be objects. We just need to
check that they are initialized.
This commit is contained in:
Nikita Popov 2018-10-11 12:01:18 +02:00
parent a8bc3889fd
commit 32d7e08286
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/filter/filter.c
View File

@ -561,6 +561,11 @@ static zval *php_filter_get_storage(zend_long arg)/* {{{ */
break;
}
if (array_ptr && Z_TYPE_P(array_ptr) != IS_ARRAY) {
/* Storage not initialized */
return NULL;
}
return array_ptr;
}
/* }}} */
@ -580,7 +585,7 @@ PHP_FUNCTION(filter_has_var)
array_ptr = php_filter_get_storage(arg);
if (array_ptr && HASH_OF(array_ptr) && zend_hash_exists(HASH_OF(array_ptr), var)) {
if (array_ptr && zend_hash_exists(Z_ARRVAL_P(array_ptr), var)) {
RETURN_TRUE;
}
@ -733,7 +738,7 @@ PHP_FUNCTION(filter_input)
input = php_filter_get_storage(fetch_from);
if (!input || !HASH_OF(input) || (tmp = zend_hash_find(HASH_OF(input), var)) == NULL) {
if (!input || (tmp = zend_hash_find(Z_ARRVAL_P(input), var)) == NULL) {
zend_long filter_flags = 0;
zval *option, *opt, *def;
if (filter_args) {
@ -810,7 +815,7 @@ PHP_FUNCTION(filter_input_array)
array_input = php_filter_get_storage(fetch_from);
if (!array_input || !HASH_OF(array_input)) {
if (!array_input) {
zend_long filter_flags = 0;
zval *option;
if (op) {