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

Merge pull request #2813 from AZero13/memcpy

Browse Source 
We copy from p, not p + module_len
This commit is contained in:
Martin Matuška authored and GitHub committed 2025-12-26 10:22:13 +01:00
2 parents 1cd0b9179c e75e5892fd
commit b2d68e2f1a
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
tar/write.c
+2 -2
View File
@@ -163,7 +163,7 @@ set_writer_options(struct bsdtar *bsdtar, struct archive *a)
* a format or filters which are not added to
* the archive write object. */
memcpy(p, IGNORE_WRONG_MODULE_NAME, module_len);
memcpy(p, writer_options, opt_len);
memcpy(p + module_len, writer_options, opt_len);
r = archive_write_set_options(a, p);
free(p);
if (r < ARCHIVE_WARN)
@@ -195,7 +195,7 @@ set_reader_options(struct bsdtar *bsdtar, struct archive *a)
* a format or filters which are not added to
* the archive write object. */
memcpy(p, IGNORE_WRONG_MODULE_NAME, module_len);
memcpy(p, reader_options, opt_len);
memcpy(p + module_len, reader_options, opt_len);
r = archive_read_set_options(a, p);
free(p);
if (r < ARCHIVE_WARN)