github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2968 from stoeckmann/isofile_gen_utility_names_dotdot

Browse Source 
iso9660: Fix `..` (dot dot) path normalization
(cherry picked from commit 45d9c12632)
This commit is contained in:
Tim Kientzle authored and Martin Matuska committed 2026-06-23 10:01:21 +02:00
1 parent 7242dfa1d8
commit 6e6865af32
2 files changed
+13 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libarchive/archive_write_set_format_iso9660.c
+11 -2
View File
@@ -4910,20 +4910,29 @@ isofile_gen_utility_names(struct archive_write *a, struct isofile *file)
* --> 'dir/dir2/'
*/
char *rp = p -1;
size_t off;
for (off = 4; p[off] == '/'; off++)
;
while (rp >= dirname) {
if (*rp == '/')
break;
--rp;
}
if (rp > dirname) {
strcpy(rp, p+3);
memmove(rp + 1, p + off, strlen(p + off) + 1);
p = rp;
} else {
strcpy(dirname, p+4);
memmove(dirname, p + off, strlen(p + off) + 1);
p = dirname;
}
} else
p++;
} else if (p == dirname && p[0] == '.' && p[1] == '.' && p[2] == '/') {
size_t off;
for (off = 3; p[off] == '/'; off++)
;
memmove(dirname, p + off, strlen(p + off) + 1);
p = dirname;
} else
p++;
}
libarchive/test/test_write_format_iso9660.c
+2 -2
View File
@@ -154,7 +154,7 @@ DEFINE_TEST(test_write_format_iso9660)
archive_entry_set_birthtime(ae, 3, 30);
archive_entry_set_ctime(ae, 4, 40);
archive_entry_set_mtime(ae, 5, 50);
archive_entry_copy_pathname(ae, "dir0/dir1/file1");
archive_entry_copy_pathname(ae, "dir0/../../dir0/dir1/file1");
archive_entry_set_mode(ae, AE_IFREG | 0755);
archive_entry_set_size(ae, 8);
archive_entry_set_nlink(ae, 1);
@@ -170,7 +170,7 @@ DEFINE_TEST(test_write_format_iso9660)
archive_entry_set_birthtime(ae, 3, 30);
archive_entry_set_ctime(ae, 4, 40);
archive_entry_set_mtime(ae, 5, 50);
archive_entry_copy_pathname(ae, "dir0/dir1/file2");
archive_entry_copy_pathname(ae, "dir0/..//dir0/dir1/file2");
archive_entry_set_mode(ae, AE_IFREG | 0755);
archive_entry_set_size(ae, 8);
archive_entry_set_nlink(ae, 1);