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 #2813 from AZero13/memcpy

Browse Source 
We copy from p, not p + module_len
This commit is contained in:
Martin Matuška 2025-12-26 10:22:13 +01:00 committed by GitHub
commit b2d68e2f1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tar/write.c
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)