MFH: init variables and get rid of annoying warnings

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index cbf2f1fb61b15440d1491eec5656805c3247e330..0eaf0332c17ee59377dce808d4f659d2da505d1b 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1793,8 +1793,8 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 {
        zend_op *opline = EX(opline);
        zval **original_return_value;
-       zend_class_entry *current_scope;
-       zval *current_this;
+       zend_class_entry *current_scope = NULL;
+       zval *current_this = NULL;
        int return_value_used = RETURN_VALUE_USED(opline);
        zend_bool should_change_scope;
        zend_op *ctor_opline;
@@ -3158,7 +3158,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
        ulong int_key;
        HashTable *fe_ht;
        zend_object_iterator *iter = NULL;
-       int key_type;
+       int key_type = 0;
        zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY);
 
        PZVAL_LOCK(array);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f752cd7efd69ac91fbfe2743b9e6786f28c127d2..9133269f396abebec8bd74a83e110c982c15da35 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -126,8 +126,8 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zval **original_return_value;
-       zend_class_entry *current_scope;
-       zval *current_this;
+       zend_class_entry *current_scope = NULL;
+       zval *current_this = NULL;
        int return_value_used = RETURN_VALUE_USED(opline);
        zend_bool should_change_scope;
        zend_op *ctor_opline;
@@ -7832,7 +7832,7 @@ static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ulong int_key;
        HashTable *fe_ht;
        zend_object_iterator *iter = NULL;
-       int key_type;
+       int key_type = 0;
        zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY);
 
        PZVAL_LOCK(array);