[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] [php-src] master: Fix debug backtrace frameno (#8761)
From:       twosee via GitHub <noreply () php ! net>
Date:       2022-09-29 14:26:47
Message-ID: 39dDuz1AxxAwM08lefkrTS9KXWzF4RI20itA4oblc50 () main ! php ! net
[Download RAW message or body]

Author: twosee (twose)
Committer: GitHub (web-flow)
Pusher: iluuu1994
Date: 2022-09-29T16:17:17+02:00

Commit: https://github.com/php/php-src/commit/fc37a8262b5a2ad7908fee3457fa11d41d4671cb
Raw diff: https://github.com/php/php-src/commit/fc37a8262b5a2ad7908fee3457fa11d41d4671cb.diff

Fix debug backtrace frameno (#8761)

Changed paths:
  M  Zend/zend_builtin_functions.c


Diff:

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 8813fa9788a9..a762240abe36 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -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);
 		}
 
-		frameno++;
-
 		/* We use _zend_hash_append*() and the array must be preallocated */
 		stack_frame = zend_new_array(8);
 		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);
 		zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
+		frameno++;
 
 skip_frame:
 		if (UNEXPECTED(ZEND_CALL_KIND(call) == ZEND_CALL_TOP_FUNCTION)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]