diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2026-01-05 20:08:25 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2026-01-05 20:10:21 +0000 |
| commit | 01333e8c4dd7b5e2bb90cc773332613cf085ccf4 (patch) | |
| tree | d3695e6c5576083074ed3d96865707633a9d6028 /tar/write.c | |
| parent | bf3359d92128e09a91c702f7da132d329ffda123 (diff) | |
Diffstat (limited to 'tar/write.c')
| -rw-r--r-- | tar/write.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tar/write.c b/tar/write.c index 9e6c97b580b7..b39a397707ba 100644 --- a/tar/write.c +++ b/tar/write.c @@ -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) @@ -190,13 +190,12 @@ set_reader_options(struct bsdtar *bsdtar, struct archive *a) char *p; /* Set default write options. */ if ((p = malloc(module_len + opt_len)) == NULL) - if (p == NULL) lafe_errc(1, errno, "Out of memory"); /* Prepend magic code to ignore options for * 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) |