git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-19 16:55:31 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

t: fix Lexer line count for $() inside double-quoted strings

Browse Source 
scan_dqstring's post-loop newline counter re-counts newlines that
were already counted during recursive parsing of $() bodies.  This
happens because scan_dollar returns text containing newlines (from
multi-line command substitutions), and the catch-all counter at the
end of scan_dqstring counts all of them again.

Fix this by counting newlines inline as non-special characters are
consumed, and removing the post-loop catch-all.  Each newline is
now counted exactly once: literal newlines at the inline match,
line splices at the backslash handler, and $() newlines by
scan_token during the recursive parse.

This is a latent bug: any consumer that relies on token line
numbers rather than byte offsets would get incorrect results for
tokens following a multi-line $() inside a double-quoted string.
chainlint is not affected because it annotates the original body
text using byte offsets, not token line numbers.

Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Montalbo
2026-06-13 04:06:13 +00:00
committed by Junio C Hamano
parent 5a7b31a8f7
commit ee98f4be26
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/lib-shell-parser.pl
View File

@@ -93,8 +93,12 @@ sub scan_dqstring {
my $b = $self->{buff};
my $s = '"';
while (1) {
# slurp up non-special characters
$s .= $1 if $$b =~ /\G([^"\$\\]+)/gc;
# Slurp non-special characters; count newlines here because
# newlines inside $() are already counted by the recursive parse.
if ($$b =~ /\G([^"\$\\]+)/gc) {
$s .= $1;
$self->{lineno} += $1 =~ tr/\n//;
}
# handle special characters
last unless $$b =~ /\G(.)/sgc;
my $c = $1;
@@ -111,7 +115,6 @@ sub scan_dqstring {
}
die("internal error scanning dq-string '$c'\n");
}
$self->{lineno} += () = $s =~ /\n/sg;
return $s;
}