From 509c9d44e2c2140c4f7bbd4038d8a695dd30f8c3 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Mon, 10 Apr 2006 23:15:26 +0000 Subject: [PATCH] - Iterators from overloaded objects are allowed to not have keys... --- Zend/zend_vm_def.h | 5 ++++- Zend/zend_vm_execute.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 3f9597b49a..fcb3974a7f 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -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; } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a912b5582b..c471927301 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -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; } } -- 2.50.1