diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-04-14 17:58:58 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-04-14 17:58:58 +0200 |
| commit | f3e124d58dc4627eb89625a7c264cb009130f725 (patch) | |
| tree | c256b36decc201ef6eb780b4ff80f5a97c7b5b42 /Zend/zend_builtin_functions.c | |
| parent | 4f07330e798a4e7b12bcc1811c3c71d17b71f22c (diff) | |
| parent | b4a142ab974747be2fd03d055b30c63286a687fd (diff) | |
| download | php-git-f3e124d58dc4627eb89625a7c264cb009130f725.tar.gz | |
Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index be6b11f6a8..996c11b24d 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -27,6 +27,7 @@ #include "zend_exceptions.h" #include "zend_extensions.h" #include "zend_closures.h" +#include "zend_generators.h" #undef ZEND_TEST_EXCEPTIONS @@ -2269,6 +2270,8 @@ ZEND_FUNCTION(debug_print_backtrace) call_type = NULL; ZVAL_UNDEF(&arg_array); + ptr = zend_generator_check_placeholder_frame(ptr); + skip = ptr; /* skip internal handler */ if ((!skip->func || !ZEND_USER_CODE(skip->func->common.type)) && @@ -2467,6 +2470,8 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int frameno++; array_init(&stack_frame); + ptr = zend_generator_check_placeholder_frame(ptr); + skip = ptr; /* skip internal handler */ if ((!skip->func || !ZEND_USER_CODE(skip->func->common.type)) && |