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

Merge pull request #3125 from stoeckmann/disk_clone

Browse Source 
Check allocation in `_archive_write_disk_header`

(cherry picked from commit 2b21f5a6cc)
This commit is contained in:
Dustin L. Howett authored and Martin Matuska committed 2026-06-23 11:00:15 +02:00
1 parent 5eb060231f
commit 47926b95a9
2 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libarchive/archive_write_disk_posix.c
+5 -4
View File
@@ -600,11 +600,12 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
a->pst = NULL;
a->current_fixup = NULL;
a->deferred = 0;
if (a->entry) {
archive_entry_free(a->entry);
a->entry = NULL;
}
archive_entry_free(a->entry);
a->entry = archive_entry_clone(entry);
if (a->entry == NULL) {
archive_set_error(&a->archive, ENOMEM, "Out of memory");
return (ARCHIVE_FATAL);
}
a->fd = -1;
a->fd_offset = 0;
a->offset = 0;
libarchive/archive_write_disk_windows.c
+4 -1
View File
@@ -859,8 +859,11 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
a->current_fixup = NULL;
a->deferred = 0;
archive_entry_free(a->entry);
a->entry = NULL;
a->entry = archive_entry_clone(entry);
if (a->entry == NULL) {
archive_set_error(&a->archive, ENOMEM, "Out of memory");
return (ARCHIVE_FATAL);
}
a->fh = INVALID_HANDLE_VALUE;
a->fd_offset = 0;
a->offset = 0;