| Marcus Boerger 2004-04-15, 6:32 pm |
| helly Thu Apr 15 17:32:34 2004 EDT
Modified files:
/ZendEngine2 zend_execute.c
Log:
Handle failure in get_current_data
http://cvs.php.net/diff.php/ZendEng...2&r2=1.643&ty=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.642 ZendEngine2/zend_execute.c:1.643
--- ZendEngine2/zend_execute.c:1.642 Thu Apr 1 17:05:35 2004
+++ ZendEngine2/zend_execute.c Thu Apr 15 17:32:34 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.642 2004/04/01 22:05:35 iliaa Exp $ */
+/* $Id: zend_execute.c,v 1.643 2004/04/15 21:32:34 helly Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -3825,6 +3825,11 @@
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 {
|