undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wildmatch: avoid undefined behavior

Browse Source 
The code changed in this commit is designed to check if the pattern
starts with "**/" or contains "/**/" (see 3a078dec33 (wildmatch: fix
"**" special case, 2013-01-01)). Unfortunately when the pattern begins
with "**/" `prev_p = p - 2` is evaluated when `p` points to the second
"*" and so the subtraction is undefined according to section 6.5.6 of
the C standard because the result does not point within the same object
as `p`. Fix this by avoiding the subtraction unless it is well defined.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2023-03-20 16:10:01 +00:00 committed by Junio C Hamano
parent 1f2e05f0b7
commit 81b26f8f28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wildmatch.c
View File

@ -83,12 +83,12 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
continue; continue;
case '*': case '*':
if (*++p == '*') { if (*++p == '*') {
const uchar *prev_p = p - 2; const uchar *prev_p = p;
while (*++p == '*') {} while (*++p == '*') {}
if (!(flags & WM_PATHNAME)) if (!(flags & WM_PATHNAME))
/* without WM_PATHNAME, '*' == '**' */ /* without WM_PATHNAME, '*' == '**' */
match_slash = 1; match_slash = 1;
else if ((prev_p < pattern || *prev_p == '/') && else if ((prev_p - pattern < 2 || *(prev_p - 2) == '/') &&
(*p == '\0' || *p == '/' || (*p == '\0' || *p == '/' ||
(p[0] == '\\' && p[1] == '/'))) { (p[0] == '\\' && p[1] == '/'))) {
/* /*