clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicate "non well-formed" warning

Browse Source 
The arginfo checking code for internal functions should not generate
this warning, as it will be thrown by zpp.
This commit is contained in:
Nikita Popov 2019-08-26 13:14:53 +02:00
parent d5f42d68c8
commit 0038db2251
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zend/zend_execute.c
View File

@ -865,10 +865,27 @@ static zend_bool zend_verify_weak_scalar_type_hint_no_sideeffect(zend_uchar type
}
case IS_LONG: {
zend_long dest;
if (Z_TYPE_P(arg) == IS_STRING) {
/* Handle this case separately to avoid the "non well-formed" warning */
double dval;
zend_uchar type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), NULL, &dval, 1);
if (type == IS_LONG) {
return 1;
}
if (type == IS_DOUBLE) {
return !zend_isnan(dval) && ZEND_DOUBLE_FITS_LONG(dval);
}
return 0;
}
return zend_parse_arg_long_weak(arg, &dest);
}
case IS_DOUBLE: {
double dest;
if (Z_TYPE_P(arg) == IS_STRING) {
/* Handle this case separately to avoid the "non well-formed" warning */
return is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), NULL, NULL, 1) != 0;
}
return zend_parse_arg_double_weak(arg, &dest);
}
case IS_STRING: