com php-src: Fix bug #68816 - pointer to local outside of scope: ext/spl/spl_iterators.c
| From: | Stanislav Malyshev | Date: | Thu, 15 Jan 2015 00:14:43 +0000 |
| Subject: | com php-src: Fix bug #68816 - pointer to local outside of scope: ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84097@lists.php.net to get a copy of this message | ||
Commit: 8d26c53f7cd1aa51ac39f26d59bfbf673b260350
Author: Stanislav Malyshev <stas@php.net> Wed, 14 Jan 2015 16:14:43 -0800
Parents: 7f95aa4d97b6a687f7b4565157b934610d354f43
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8d26c53f7cd1aa51ac39f26d59bfbf673b260350
Log:
Fix bug #68816 - pointer to local outside of scope
Bugs:
https://bugs.php.net/68816
Changed paths:
M ext/spl/spl_iterators.c
Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 90ff2bb..3be74b6 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -476,13 +476,14 @@ static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS,
zend_cla
zend_long mode, flags;
int inc_refcount = 1;
zend_error_handling error_handling;
+ zval caching_it;
zend_replace_error_handling(EH_THROW, spl_ce_InvalidArgumentException, &error_handling);
switch (rit_type) {
case RIT_RecursiveTreeIterator: {
- zval caching_it, caching_it_flags, *user_caching_it_flags = NULL;
+ zval caching_it_flags, *user_caching_it_flags = NULL;
mode = RIT_SELF_FIRST;
flags = RTIT_BYPASS_KEY;