com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/spl/spl _iterators.c

Commit: 2597f5d66552051994ed55655107d9c5142f7d34 Author: Pierrick Charron <pierrick@php.net> Tue, 26 Jul 2016 20:36:34 -0400 Parents: 31ed322b0699e188f418a74adeec4c7e4ddd0bae 4c2e1a13be27b0c44ac5c33a6c548a3d5e5faf8c Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2597f5d66552051994ed55655107d9c5142f7d34 Log: Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: ext/spl/spl_iterators.c Changed paths: MM ext/spl/spl_iterators.c Diff: diff --cc ext/spl/spl_iterators.c index 6a00497,a023b11..0977228 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@@ -1675,12 -1684,12 +1675,12 @@@ static inline void spl_dual_it_free(spl } } -static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC) +static inline void spl_dual_it_rewind(spl_dual_it_object *intern) { - spl_dual_it_free(intern TSRMLS_CC); + spl_dual_it_free(intern); intern->current.pos = 0; - if (intern->inner.iterator->funcs->rewind) { + if (intern->inner.iterator && intern->inner.iterator->funcs->rewind) { - intern->inner.iterator->funcs->rewind(intern->inner.iterator TSRMLS_CC); + intern->inner.iterator->funcs->rewind(intern->inner.iterator); } }