get rid of more "might be uninitialized" warnings

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index dbf7de89d7d05ebfae775a2fafe84381be91b23d..0845af81eb24ba37d20d73763db0222175e66766 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1818,8 +1818,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;
@@ -3245,7 +3245,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 57717550aa38a814f18c502bba853606cc479cc2..91fed15c6afe7accb8e50503caba2b50f250d7d2 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -133,8 +133,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;
@@ -7962,7 +7962,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);