Fixed bug #75230 (Invalid opcode 49/1/8 using opcache)

laruence · laruence · commit ed2a5ebaeb9f · 2017-09-24T18:01:29.000+08:00
diff --git a/NEWS b/NEWS
@@ -16,6 +16,9 @@ PHP                                                                        NEWS
 - MySQLi:
   . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)
 
+- Opcache:
+  . Fixed bug #75230 (Invalid opcode 49/1/8 using opcache). (Laruence)
+
 - PCRE:
   . Fixed bug ##75223 (PCRE JIT broken in 7.2). (Dmitry)
 
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
@@ -260,6 +260,7 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,
 {
 	switch (opline->opcode) {
 		case ZEND_FREE:
+		case ZEND_CHECK_VAR:
 			MAKE_NOP(opline);
 			zval_ptr_dtor_nogc(val);
 			return 1;
diff --git a/ext/opcache/tests/bug75230.phpt b/ext/opcache/tests/bug75230.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #75230 (Invalid opcode 49/1/8 using opcache)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+function f() {
+	  $retval = false;
+	    if ($retval) { }
+}
+f();
+exit("OK");
+?>
+--EXPECT--
+OK

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,`
`260`	`260`	`{`
`261`	`261`	`switch (opline->opcode) {`
`262`	`262`	`case ZEND_FREE:`
	`263`	`+ case ZEND_CHECK_VAR:`
`263`	`264`	`MAKE_NOP(opline);`
`264`	`265`	`zval_ptr_dtor_nogc(val);`
`265`	`266`	`return 1;`