Mirrors/libarchive
0
0
Fork 0
mirror of https://github.com/libarchive/libarchive.git synced 2026-01-18 17:11:25 +01:00
Code Packages Releases Activity

Merge pull request #2809 from mmatuska/fix/2787

Browse Source 
tar: fix off-bounds read resulting from #2787 (3150539ed)
This commit is contained in:
Martin Matuška
2025-12-12 12:04:09 +01:00
committed by GitHub
parent 8c86c46d1b cfb02de558
commit a7f3b56af6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tar/subst.c
View File

@@ -237,7 +237,7 @@ apply_substitution(struct bsdtar *bsdtar, const char *name, char **result,
char isEnd = 0;
do {
isEnd = *name == '\0';
isEnd = *name == '\0';
if (regexec(&rule->re, name, 10, matches, 0))
break;
@@ -293,13 +293,13 @@ apply_substitution(struct bsdtar *bsdtar, const char *name, char **result,
realloc_strcat(result, rule->result + j);
if (matches[0].rm_eo > 0) {
name += matches[0].rm_eo;
} else {
// We skip a character because the match is 0-length
// so we need to add it to the output
realloc_strncat(result, name, 1);
name += 1;
}
name += matches[0].rm_eo;
} else if (!isEnd) {
// We skip a character because the match is 0-length
// so we need to add it to the output
realloc_strncat(result, name, 1);
name += 1;
}
} while (rule->global && !isEnd); // Testing one step after because sed et al. run 0-length patterns a last time on the empty string at the end
}