--- embedaddon/php/Zend/zend_iterators.c	2012/02/21 23:47:52	1.1.1.1
+++ embedaddon/php/Zend/zend_iterators.c	2014/06/15 20:04:03	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_iterators.c,v 1.1.1.1 2012/02/21 23:47:52 misho Exp $ */
+/* $Id: zend_iterators.c,v 1.1.1.4 2014/06/15 20:04:03 misho Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -51,7 +51,7 @@ static zend_object_handlers iterator_object_handlers =
 ZEND_API void zend_register_iterator_wrapper(TSRMLS_D)
 {
 	INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL);
-	free(zend_iterator_class_entry.name);
+	str_free(zend_iterator_class_entry.name);
 	zend_iterator_class_entry.name = "__iterator_wrapper";
 }
 
@@ -82,13 +82,13 @@ ZEND_API enum zend_object_iterator_kind zend_iterator_
 				*iter = (zend_object_iterator *)zend_object_store_get_object(array_ptr TSRMLS_CC);
 				return ZEND_ITER_OBJECT;
 			}
-			if (HASH_OF(array_ptr)) {
+			if (Z_OBJPROP_P(array_ptr)) {
 				return ZEND_ITER_PLAIN_OBJECT;
 			}
 			return ZEND_ITER_INVALID;
 
 		case IS_ARRAY:
-			if (HASH_OF(array_ptr)) {
+			if (Z_ARRVAL_P(array_ptr)) {
 				return ZEND_ITER_PLAIN_ARRAY;
 			}
 			return ZEND_ITER_INVALID;