summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2006-04-10 23:16:29 +0000
committerMarcus Boerger <helly@php.net>2006-04-10 23:16:29 +0000
commit6ea747d8e47d397702a46d86e311ea2231e8c9a2 (patch)
treeadabc47e86470b9ab77a982b8af5c5b7555cef5a
parent6c89fd2d63f784b26cda99d5461a291af35baf20 (diff)
downloadphp-git-6ea747d8e47d397702a46d86e311ea2231e8c9a2.tar.gz
- MFH Iterators from overloaded objects are allowed to not have keys...
-rw-r--r--Zend/zend_vm_def.h4
-rw-r--r--Zend/zend_vm_execute.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 24d090ece7..5c1ebc15c9 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3223,7 +3223,9 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
key->value.lval = int_key;
key->type = IS_LONG;
break;
- EMPTY_SWITCH_DEFAULT_CASE()
+ default:
+ ZVAL_NULL(key);
+ break;
}
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index a9a3c5c2f7..4ce5c0f3be 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -7724,7 +7724,9 @@ static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
key->value.lval = int_key;
key->type = IS_LONG;
break;
- EMPTY_SWITCH_DEFAULT_CASE()
+ default:
+ ZVAL_NULL(key);
+ break;
}
}