]> granicus.if.org Git - php/commitdiff
- Iterators from overloaded objects are allowed to not have keys...
authorMarcus Boerger <helly@php.net>
Mon, 10 Apr 2006 23:15:26 +0000 (23:15 +0000)
committerMarcus Boerger <helly@php.net>
Mon, 10 Apr 2006 23:15:26 +0000 (23:15 +0000)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 3f9597b49a203da2ac0788227c4a3f89633ef8f1..fcb3974a7f66277593a0b7c87b7698a07fc1b9fb 100644 (file)
@@ -3316,7 +3316,10 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
                                Z_LVAL_P(key) = int_key;
                                Z_TYPE_P(key) = IS_LONG;
                                break;
-                       EMPTY_SWITCH_DEFAULT_CASE()
+                       default:
+                       case HASH_KEY_NON_EXISTANT:
+                               ZVAL_NULL(key);
+                               break;
                }
        }
 
index a912b5582b870b57f65132b0273db098d51e1e51..c4719273016010708c64bb4a1889ae36ea18c7c3 100644 (file)
@@ -7854,7 +7854,10 @@ static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                Z_LVAL_P(key) = int_key;
                                Z_TYPE_P(key) = IS_LONG;
                                break;
-                       EMPTY_SWITCH_DEFAULT_CASE()
+                       default:
+                       case HASH_KEY_NON_EXISTANT:
+                               ZVAL_NULL(key);
+                               break;
                }
        }