com php-src: Fixed bug #70323 (Regression in zend_fetch_deb ug_backtrace() can cause segfaults): NEWS Z end/zend_builtin_functions.c
| From: | Xinchen Hui | Date: | Mon, 09 Nov 2015 09:14:15 +0000 |
| Subject: | com php-src: Fixed bug #70323 (Regression in zend_fetch_deb ug_backtrace() can cause segfaults): NEWS Z end/zend_builtin_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89655@lists.php.net to get a copy of this message | ||
Commit: d70aa14f2c1617800cbab431db5c2ea021969cc6
Author: Xinchen Hui <laruence@gmail.com> Mon, 9 Nov 2015 17:14:15 +0800
Parents: 0a1e199682c1f2503cc78f900c55ad15fcf89b1d
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d70aa14f2c1617800cbab431db5c2ea021969cc6
Log:
Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause segfaults)
Bugs:
https://bugs.php.net/70323
Changed paths:
M NEWS
M Zend/zend_builtin_functions.c
Diff:
diff --git a/NEWS b/NEWS
index 606bb04..f45a930 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP NEWS
. Fixed bug #70863 (Incorect logic to increment_function for proxy objects).
(Anatol)
. Fixed bug #70842 (Persistent Stream Segmentation Fault). (Caleb Champlin)
+ . Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause
+ segfaults). (Aharvey, Laruence)
- Opcache:
. Fixed bug #70843 (Segmentation fault on MacOSX with
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 8ffdcaa...6faa57c 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2481,7 +2481,7 @@ ZEND_FUNCTION(debug_print_backtrace)
ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int options, int limit)
/* {{{ */
{
- zend_execute_data *call, *ptr, *skip;
+ zend_execute_data *ptr, *skip, *call = NULL;
zend_object *object;
int lineno, frameno = 0;
zend_function *func;
@@ -2490,8 +2490,12 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last,
int
zend_string *include_filename = NULL;
zval stack_frame;
- call = NULL;
- ptr = EG(current_execute_data);
+ array_init(return_value);
+
+ if (!(ptr = EG(current_execute_data))) {
+ return;
+ }
+
if (!ptr->func || !ZEND_USER_CODE(ptr->func->common.type)) {
call = ptr;
ptr = ptr->prev_execute_data;
@@ -2509,13 +2513,11 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last,
int
ptr = ptr->prev_execute_data;
}
}
+ if (!call) {
+ call = ptr;
+ ptr = ptr->prev_execute_data;
+ }
}
- if (!call) {
- call = ptr;
- ptr = ptr->prev_execute_data;
- }
-
- array_init(return_value);
while (ptr && (limit == 0 || frameno < limit)) {
frameno++;