]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Tue, 7 Jul 2015 13:28:51 +0000 (21:28 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 7 Jul 2015 13:28:51 +0000 (21:28 +0800)
Conflicts:
ext/spl/spl_iterators.c

1  2 
ext/spl/spl_iterators.c

index 504065e7fddd2e0887d711c7f231421fc82aa08e,359d94d6ed26d7ead2d6e5b54c9f25780618bbe3..e8fe2ce1014e946c345476736eeacef33ba9329c
@@@ -390,9 -380,11 +390,11 @@@ next_step
                                        }
                                }
                        }
-                       zend_iterator_dtor(iterator);
-                       zval_ptr_dtor(&object->iterators[object->level].zobject);
-                       object->level--;
+                       if (object->level > 0) {
 -                              iterator->funcs->dtor(iterator TSRMLS_CC);
++                              zend_iterator_dtor(iterator);
+                               zval_ptr_dtor(&object->iterators[object->level].zobject);
+                               object->level--;
+                       }
                } else {
                        return; /* done completeley */
                }