From: Marcus Boerger <helly@php.net>
Date: Thu, 15 Apr 2004 21:32:34 +0000 (+0000)
Subject: Handle failure in get_current_data
X-Git-Tag: php-5.0.0RC2RC2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a455d7846d5f3b2afd45b415060655d5e236ccc9;p=php

Handle failure in get_current_data
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 57cd4e8f18..147bf668b7 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -3825,6 +3825,11 @@ int zend_fe_fetch_handler(ZEND_OPCODE_HANDLER_ARGS)
 				return 0; /* CHECK_ME */
 			}	
 			iter->funcs->get_current_data(iter, &value TSRMLS_CC);
+			if (!value) {
+				/* failure in get_current_data */
+				SET_OPCODE(op_array->opcodes+opline->op2.u.opline_num);
+				return 0; /* CHECK_ME */
+			}
 			if (iter->funcs->get_current_key) {
 				key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC);
 			} else {