Fixed Conditional jump or move depends on uninitialised value(s)

laruence · laruence · commit 509d75527afc · 2015-06-18T19:56:50.000+08:00
reproduced by Bug #69868's test script
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -4406,7 +4406,13 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 					opline->op2.num = -1;
 				}
 			}
-		}
+		} else {
+			if (opline->opcode == ZEND_RECV_INIT) {
+				Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) = -1;
+			} else {
+				opline->op2.num = -1;
+			}
+		}	
 	}
 
 	/* These are assigned at the end to avoid unitialized memory in case of an error */

Original file line number	Diff line number	Diff line change
`@@ -4406,7 +4406,13 @@ void zend_compile_params(zend_ast ast, zend_ast return_type_ast) /* {{{ */`
`4406`	`4406`	`opline->op2.num = -1;`
`4407`	`4407`	`}`
`4408`	`4408`	`}`
`4409`		`- }`
	`4409`	`+ } else {`
	`4410`	`+ if (opline->opcode == ZEND_RECV_INIT) {`
	`4411`	`+ Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) = -1;`
	`4412`	`+ } else {`
	`4413`	`+ opline->op2.num = -1;`
	`4414`	`+ }`
	`4415`	`+ }`
`4410`	`4416`	`}`
`4411`	`4417`
`4412`	`4418`	`/* These are assigned at the end to avoid unitialized memory in case of an error */`