Fix compiler warnings 1/2

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index cbc80ba36107da7deb07108d933c2417c6536107..ceae25eb96153fbb3b0fb652c8214a1d94ed80c7 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -944,7 +944,7 @@ ZEND_VM_HANDLER(41, ZEND_PRINT, CONST|TMP|VAR|CV, ANY)
 ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, ANY, int type)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       zend_free_op free_op1 = {0};
        zval *varname = GET_OP1_ZVAL_PTR(BP_VAR_R);
        zval **retval;
        zval tmp_varname;

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index da2e347388cb11c38e5c0994a0a030a6fb8d13ca..106d282bfe2b1aed6d9f2a80ff09e5f7b7d041dc 100644 (file)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -695,6 +695,7 @@ function gen_null_handler($f) {
                out($f,"static int ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
                out($f,"{\n");
                out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
+               out($f,"\treturn 0;\n");
                out($f,"}\n\n");
        }
 }