mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fix warning on non-numeric offsets
This commit is contained in:
parent
d1be77edfb
commit
327a5828cd
@ -64,9 +64,7 @@ bool(false)
|
||||
bool(true)
|
||||
bool(true)
|
||||
bool(true)
|
||||
|
||||
Notice: A non well formed numeric value encountered in %s line %d
|
||||
bool(false)
|
||||
bool(true)
|
||||
- bool ---
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
@ -64,9 +64,7 @@ bool(true)
|
||||
bool(true)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Notice: A non well formed numeric value encountered in %s line %d
|
||||
bool(true)
|
||||
bool(false)
|
||||
- bool ---
|
||||
bool(true)
|
||||
bool(true)
|
||||
|
@ -4509,7 +4509,7 @@ ZEND_VM_C_LABEL(num_index_prop):
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
|
@ -14037,7 +14037,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -15950,7 +15950,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -18221,7 +18221,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -21142,7 +21142,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -22476,7 +22476,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -23633,7 +23633,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -24790,7 +24790,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -26213,7 +26213,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -29528,7 +29528,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -31315,7 +31315,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -33459,7 +33459,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
@ -36117,7 +36117,7 @@ num_index_prop:
|
||||
if (Z_TYPE_P(offset) != IS_LONG) {
|
||||
if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
|
||||
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
|
||||
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
|
||||
ZVAL_COPY_VALUE(&tmp, offset);
|
||||
zval_copy_ctor(&tmp);
|
||||
convert_to_long(&tmp);
|
||||
|
Loading…
Reference in New Issue
Block a user