Fixes

hikari-no-yume · hikari-no-yume · commit 429a75da507d · 2016-03-25T17:14:02.000Z
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -6211,7 +6211,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;
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -6211,7 +6211,7 @@ ZEND_API zend_bool zend_binary_op_produces_numeric_string_error(uint32_t opcode,`
`6211`	`6211`	`}`
`6212`	`6212`
`6213`	`6213`	`/* While basic arithmetic operators always produce numeric string errors,`
`6214`		`- * bitwise operators only produce errors when both operands are strings */`
	`6214`	`+ * bitwise operators don't produce errors if both operands are strings */`
`6215`	`6215`	`if ((opcode == ZEND_BW_OR \|\| opcode == ZEND_BW_AND \|\| opcode == ZEND_BW_XOR)`
`6216`	`6216`	`&& Z_TYPE_P(op1) == IS_STRING && Z_TYPE_P(op2) == IS_STRING) {`
`6217`	`6217`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,6 @@ static zend_always_inline zend_long ZEND_FASTCALL _zval_get_long_func_ex(zval *o`
`779`	`779`	`return zend_dval_to_lval_cap(dval);`
`780`	`780`	`}`
`781`	`781`	`}`
`782`		`- return ZEND_STRTOL(Z_STRVAL_P(op), NULL, 10);`
`783`	`782`	`case IS_ARRAY:`
`784`	`783`	`return zend_hash_num_elements(Z_ARRVAL_P(op)) ? 1 : 0;`
`785`	`784`	`case IS_OBJECT:`