cvs: ZendEngine2 / zend_interfaces.c

helly           Sun Apr 25 07:25:25 2004 EDT

  Modified files:              
    /ZendEngine2        zend_interfaces.c 
  Log:
  Capture potential problem by error message
  
http://cvs.php.net/diff.php/ZendEngine2/zend_interfaces.c?r1=1.18&r2=1.19&ty=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.18 ZendEngine2/zend_interfaces.c:1.19
--- ZendEngine2/zend_interfaces.c:1.18  Sun Mar 28 09:32:32 2004
+++ ZendEngine2/zend_interfaces.c       Sun Apr 25 07:25:25 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_interfaces.c,v 1.18 2004/03/28 14:32:32 stas Exp $ */
+/* $Id: zend_interfaces.c,v 1.19 2004/04/25 11:25:25 helly Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -186,6 +186,13 @@
 
        zend_call_method_with_0_params(&object, iter->ce, 
&iter->ce->iterator_funcs.zf_key, "key", &retval);
 
+       if (!retval) {
+               *str_key = "";
+               *str_key_len = 0;
+               *int_key = 0;
+               zend_error(E_WARNING, "Nothing returned from %s::key()", 
iter->ce->name);
+               return HASH_KEY_IS_LONG;
+       }
        switch (retval->type) {
                default: 
                        zend_error(E_WARNING, "Illegal type returned from 
%s::key()", iter->ce->name);

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php