mirror/libarchive
1
0
Fork 0
mirror of https://github.com/libarchive/libarchive.git synced 2026-01-26 15:39:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2787 from ljdarj/aar

Browse Source 
Fix bsdtar zero-length pattern issue.
This commit is contained in:
Tim Kientzle 2025-11-20 21:40:17 -08:00 committed by GitHub
commit 81bc00a549
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tar/subst.c
View File

@ -235,7 +235,9 @@ apply_substitution(struct bsdtar *bsdtar, const char *name, char **result,
(*result)[0] = 0;
}
while (1) {
char isEnd = 0;
do {
isEnd = *name == '\0';
if (regexec(&rule->re, name, 10, matches, 0))
break;
@ -290,12 +292,15 @@ apply_substitution(struct bsdtar *bsdtar, const char *name, char **result,
}
realloc_strcat(result, rule->result + j);
name += matches[0].rm_eo;
if (!rule->global)
break;
}
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;
}
} 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
}
if (got_match)

8
tar/test/test_option_s.c
View File

@ -42,7 +42,13 @@ DEFINE_TEST(test_option_s)
systemf("%s -cf test1_2.tar -s /d1/d2/ in/d1/foo", testprog);
systemf("%s -xf test1_2.tar -C test1", testprog);
assertFileContents("foo", 3, "test1/in/d2/foo");
systemf("%s -cf test1_3.tar -s /o/#/g in/d1/foo", testprog);
systemf("%s -xf test1_3.tar -C test1", testprog);
assertFileContents("foo", 3, "test1/in/d1/f##");
// For the 0-length pattern check, remember that "test1/" isn't part of the string affected by the regexp
systemf("%s -cf test1_4.tar -s /f*/\\<~\\>/g in/d1/foo", testprog);
systemf("%s -xf test1_4.tar -C test1", testprog);
assertFileContents("foo", 3, "test1/<>i<>n<>/<>d<>1<>/<f><>o<>o<>");
/*
* Test 2: Basic substitution when extracting archive.
*/