1 files changed, 6 insertions, 12 deletions

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index d12b504a2d..619bb8cc1b 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -839,8 +839,7 @@ void do_return(znode *expr CLS_DC)
 	} else {
 		var_uninit(&opline->op1.u.constant);
 		opline->op1.op_type = IS_CONST;
-		opline->op1.u.constant.refcount=1;
-		opline->op1.u.constant.EA=0;
+		INIT_PZVAL(&opline->op1.u.constant);
 	}
 	SET_UNUSED(opline->op2);
 }
@@ -1038,8 +1037,7 @@ void do_brk_cont(int op, znode *expr CLS_DC)
 	} else {
 		opline->op2.u.constant.type = IS_LONG;
 		opline->op2.u.constant.value.lval = 1;
-		opline->op2.u.constant.refcount=1;
-		opline->op2.u.constant.EA=0;
+		INIT_PZVAL(&opline->op2.u.constant);
 		opline->op2.op_type = IS_CONST;
 	}
 }
@@ -1189,8 +1187,7 @@ void do_default_before_statement(znode *case_list, znode *default_token CLS_DC)
 	opline->op1.op_type = IS_CONST;
 	opline->op1.u.constant.type = IS_LONG;
 	opline->op1.u.constant.value.lval = 1;
-	opline->op1.u.constant.refcount=1;
-	opline->op1.u.constant.EA=0;
+	INIT_PZVAL(&opline->op1.u.constant);
 	SET_UNUSED(opline->op2);
 	switch_entry_ptr->default_case = next_op_number;
 
@@ -1422,8 +1419,7 @@ void do_shell_exec(znode *result, znode *cmd CLS_DC)
 	opline->result.op_type = IS_TMP_VAR;
 	opline->op1.u.constant.value.str.val = estrndup("shell_exec",sizeof("shell_exec")-1);
 	opline->op1.u.constant.value.str.len = sizeof("shell_exec")-1;
-	opline->op1.u.constant.refcount = 1;
-	opline->op1.u.constant.EA = 0;
+	INIT_PZVAL(&opline->op1.u.constant);
 	opline->op1.u.constant.type = IS_STRING;
 	opline->op1.op_type = IS_CONST;
 	opline->extended_value = 1;
@@ -1561,8 +1557,7 @@ void do_list_end(znode *result, znode *expr CLS_DC)
 			opline->op2.op_type = IS_CONST;
 			opline->op2.u.constant.type = IS_LONG;
 			opline->op2.u.constant.value.lval = *((int *) dimension->data);
-			opline->op2.u.constant.refcount = 1;
-			opline->op2.u.constant.EA = 0;
+			INIT_PZVAL(&opline->op2.u.constant);
 			if (le == CG(list_llist).tail) {
 				opline->extended_value = ZEND_FETCH_STANDARD;
 			} else {
@@ -1972,8 +1967,7 @@ int zendlex(znode *zendlval CLS_DC)
 			break;
 	}
 		
-	zendlval->u.constant.refcount = 1;
-	zendlval->u.constant.EA = 0;
+	INIT_PZVAL(&zendlval->u.constant);
 	zendlval->op_type = IS_CONST;
 	return retval;
 }