Do not convert error-causing numeric strings ahead-of-time

hikari-no-yume · hikari-no-yume · commit a6403b79e054 · 2016-03-30T01:37:23.000+01:00
diff --git a/ext/opcache/Optimizer/pass2.c b/ext/opcache/Optimizer/pass2.c
@@ -48,7 +48,10 @@ void zend_optimizer_pass2(zend_op_array *op_array)
 			case ZEND_POW:
 				if (ZEND_OP1_TYPE(opline) == IS_CONST) {
 					if (Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING) {
-						convert_scalar_to_number(&ZEND_OP1_LITERAL(opline));
+						/* don't optimise if it should produce a runtime numeric string error */
+						if (!is_numeric_string(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)), NULL, NULL, 0)) {
+							convert_scalar_to_number(&ZEND_OP1_LITERAL(opline));
+						}
 					}
 				}
 				/* break missing *intentionally* - the assign_op's may only optimize op2 */
@@ -63,7 +66,10 @@ void zend_optimizer_pass2(zend_op_array *op_array)
 				}
 				if (ZEND_OP2_TYPE(opline) == IS_CONST) {
 					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
-						convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));
+						/* don't optimise if it should produce a runtime numeric string error */
+						if (!is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0)) {
+							convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));
+						}
 					}
 				}
 				break;
@@ -73,7 +79,11 @@ void zend_optimizer_pass2(zend_op_array *op_array)
 			case ZEND_SR:
 				if (ZEND_OP1_TYPE(opline) == IS_CONST) {
 					if (Z_TYPE(ZEND_OP1_LITERAL(opline)) != IS_LONG) {
-						convert_to_long(&ZEND_OP1_LITERAL(opline));
+						/* don't optimise if it should produce a runtime numeric string error */
+						if (!(Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING
+							&& !is_numeric_string(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)), NULL, NULL, 0))) {
+							convert_to_long(&ZEND_OP1_LITERAL(opline));
+						}
 					}
 				}
 				/* break missing *intentionally - the assign_op's may only optimize op2 */
@@ -86,7 +96,11 @@ void zend_optimizer_pass2(zend_op_array *op_array)
 				}
 				if (ZEND_OP2_TYPE(opline) == IS_CONST) {
 					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_LONG) {
-						convert_to_long(&ZEND_OP2_LITERAL(opline));
+						/* don't optimise if it should produce a runtime numeric string error */
+						if (!(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING
+							&& !is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0))) {
+							convert_to_long(&ZEND_OP2_LITERAL(opline));
+						}
 					}
 				}
 				break;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,10 @@ void zend_optimizer_pass2(zend_op_array *op_array)`
`48`	`48`	`case ZEND_POW:`
`49`	`49`	`if (ZEND_OP1_TYPE(opline) == IS_CONST) {`
`50`	`50`	`if (Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING) {`
`51`		`- convert_scalar_to_number(&ZEND_OP1_LITERAL(opline));`
	`51`	`+ /* don't optimise if it should produce a runtime numeric string error */`
	`52`	`+ if (!is_numeric_string(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)), NULL, NULL, 0)) {`
	`53`	`+ convert_scalar_to_number(&ZEND_OP1_LITERAL(opline));`
	`54`	`+ }`
`52`	`55`	`}`
`53`	`56`	`}`
`54`	`57`	`/* break missing intentionally - the assign_op's may only optimize op2 */`
`@@ -63,7 +66,10 @@ void zend_optimizer_pass2(zend_op_array *op_array)`
`63`	`66`	`}`
`64`	`67`	`if (ZEND_OP2_TYPE(opline) == IS_CONST) {`
`65`	`68`	`if (Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {`
`66`		`- convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));`
	`69`	`+ /* don't optimise if it should produce a runtime numeric string error */`
	`70`	`+ if (!is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0)) {`
	`71`	`+ convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));`
	`72`	`+ }`
`67`	`73`	`}`
`68`	`74`	`}`
`69`	`75`	`break;`
`@@ -73,7 +79,11 @@ void zend_optimizer_pass2(zend_op_array *op_array)`
`73`	`79`	`case ZEND_SR:`
`74`	`80`	`if (ZEND_OP1_TYPE(opline) == IS_CONST) {`
`75`	`81`	`if (Z_TYPE(ZEND_OP1_LITERAL(opline)) != IS_LONG) {`
`76`		`- convert_to_long(&ZEND_OP1_LITERAL(opline));`
	`82`	`+ /* don't optimise if it should produce a runtime numeric string error */`
	`83`	`+ if (!(Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING`
	`84`	`+ && !is_numeric_string(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)), NULL, NULL, 0))) {`
	`85`	`+ convert_to_long(&ZEND_OP1_LITERAL(opline));`
	`86`	`+ }`
`77`	`87`	`}`
`78`	`88`	`}`
`79`	`89`	`/* break missing intentionally - the assign_op's may only optimize op2 /`
`@@ -86,7 +96,11 @@ void zend_optimizer_pass2(zend_op_array *op_array)`
`86`	`96`	`}`
`87`	`97`	`if (ZEND_OP2_TYPE(opline) == IS_CONST) {`
`88`	`98`	`if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_LONG) {`
`89`		`- convert_to_long(&ZEND_OP2_LITERAL(opline));`
	`99`	`+ /* don't optimise if it should produce a runtime numeric string error */`
	`100`	`+ if (!(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING`
	`101`	`+ && !is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0))) {`
	`102`	`+ convert_to_long(&ZEND_OP2_LITERAL(opline));`
	`103`	`+ }`
`90`	`104`	`}`
`91`	`105`	`}`
`92`	`106`	`break;`