Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Warn about invalid strings in arithmetic #1718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hikari-no-yume wants to merge 14 commits into from
Closed

Warn about invalid strings in arithmetic #1718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
63e214c
Warn on non-/bad numeric strings in arithmetic
hikari-no-yume Jan 6, 2016
c21f088
Update tests
hikari-no-yume Jan 7, 2016
5ac4a0c
Use is_numeric_string_ex for zval_get_long etc.
hikari-no-yume Jan 26, 2016
84d6632
Update tests
hikari-no-yume Jan 26, 2016
e05b0cc
Make _zval_get_long_func_noisy function for inlining
hikari-no-yume Feb 5, 2016
f9dc354
Disable compile-time evaluation for numeric string errors
hikari-no-yume Feb 13, 2016
a6403b7
Do not convert error-causing numeric strings ahead-of-time
hikari-no-yume Feb 13, 2016
30ee954
fixup
hikari-no-yume Feb 14, 2016
d94c088
Disable optimiser evaluation for numeric string errors
hikari-no-yume Feb 14, 2016
c72e92f
Add test for scientific notation in integer operations
hikari-no-yume Jan 26, 2016
bd5f04e
Add test for numeric string errors
hikari-no-yume Feb 13, 2016
6dadb1b
Add test for numeric string errors in assignment
hikari-no-yume Feb 14, 2016
6caf1d4
Fixes
hikari-no-yume Mar 20, 2016
e05d3b6
UPGRADING and NEWS
hikari-no-yume Mar 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes
  • Loading branch information
@hikari-no-yume
hikari-no-yume committed Mar 30, 2016
commit 6caf1d4585207d1b02fb06a216cd7da1a1f5e12d
2 changes: 1 addition & 1 deletion Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6246,7 +6246,7 @@ ZEND_API zend_bool zend_binary_op_produces_numeric_string_error(uint32_t opcode,
}

/* While basic arithmetic operators always produce numeric string errors,
* bitwise operators only produce errors when *both* operands are strings */
* bitwise operators don't produce errors if both operands are strings */
if ((opcode == ZEND_BW_OR || opcode == ZEND_BW_AND || opcode == ZEND_BW_XOR)
&& Z_TYPE_P(op1) == IS_STRING && Z_TYPE_P(op2) == IS_STRING) {
return 0;
Expand Down
1 change: 0 additions & 1 deletion Zend/zend_operators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,6 @@ static zend_always_inline zend_long ZEND_FASTCALL _zval_get_long_func_ex(zval *o
return zend_dval_to_lval_cap(dval);
}
}
return ZEND_STRTOL(Z_STRVAL_P(op), NULL, 10);
case IS_ARRAY:
return zend_hash_num_elements(Z_ARRVAL_P(op)) ? 1 : 0;
case IS_OBJECT:
Expand Down