archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix debug backtrace frameno (#8761)

Browse source
This commit is contained in:
twosee 2022-09-29 22:17:17 +08:00 • committed by GitHub
parent e619af45fa
commit fc37a8262b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_builtin_functions.c
View file

@ -1737,8 +1737,6 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
prev = zend_generator_check_placeholder_frame(prev); prev = zend_generator_check_placeholder_frame(prev);
} }
frameno++;
/* We use _zend_hash_append*() and the array must be preallocated */ /* We use _zend_hash_append*() and the array must be preallocated */
stack_frame = zend_new_array(8); stack_frame = zend_new_array(8);
zend_hash_real_init_mixed(stack_frame); zend_hash_real_init_mixed(stack_frame);
@ -1882,6 +1880,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
ZVAL_ARR(&tmp, stack_frame); ZVAL_ARR(&tmp, stack_frame);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp); zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
frameno++;
skip_frame: skip_frame:
if (UNEXPECTED(ZEND_CALL_KIND(call) == ZEND_CALL_TOP_FUNCTION) if (UNEXPECTED(ZEND_CALL_KIND(call) == ZEND_CALL_TOP_FUNCTION)