diff options
| author | Tim Kientzle <kientzle@acm.org> | 2022-07-23 23:50:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-23 23:50:07 -0700 |
| commit | fd180c36036df7181a64931264732a10ad8cd024 (patch) | |
| tree | c2942c3e88721e0bc3725553c5764e68c5e6475b | |
| parent | 1385cd9c5126d9b681b7396ad2f353779ad143ba (diff) | |
| parent | bff38efe8c110469c5080d387bec62a6ca15b1a5 (diff) | |
| download | libarchive-fd180c36036df7181a64931264732a10ad8cd024.tar.gz | |
Merge pull request #1759 from obiwac/fix-1754
libarchive: Handle a `calloc` returning NULL (fixes #1754)
| -rw-r--r-- | libarchive/archive_write.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c index 66592e82..27626b54 100644 --- a/libarchive/archive_write.c +++ b/libarchive/archive_write.c @@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) struct archive_write_filter *f; f = calloc(1, sizeof(*f)); + + if (f == NULL) + return (NULL); + f->archive = _a; f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; if (a->filter_first == NULL) @@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, a->client_data = client_data; client_filter = __archive_write_allocate_filter(_a); + + if (client_filter == NULL) + return (ARCHIVE_FATAL); + client_filter->open = archive_write_client_open; client_filter->write = archive_write_client_write; client_filter->close = archive_write_client_close; |