|
 |
ff616e9 |
From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
|
|
|
ff616e9 |
From: obiwac <obiwac@gmail.com>
|
|
|
ff616e9 |
Date: Fri, 22 Jul 2022 22:41:10 +0200
|
|
|
ff616e9 |
Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
|
|
|
ff616e9 |
|
|
|
ff616e9 |
---
|
|
|
ff616e9 |
libarchive/archive_write.c | 8 ++++++++
|
|
|
ff616e9 |
1 file changed, 8 insertions(+)
|
|
|
ff616e9 |
|
|
|
ff616e9 |
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
|
|
|
ff616e9 |
index 66592e82..27626b54 100644
|
|
|
ff616e9 |
--- a/libarchive/archive_write.c
|
|
|
ff616e9 |
+++ b/libarchive/archive_write.c
|
|
|
ff616e9 |
@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
|
|
|
ff616e9 |
struct archive_write_filter *f;
|
|
|
ff616e9 |
|
|
|
ff616e9 |
f = calloc(1, sizeof(*f));
|
|
|
ff616e9 |
+
|
|
|
ff616e9 |
+ if (f == NULL)
|
|
|
ff616e9 |
+ return (NULL);
|
|
|
ff616e9 |
+
|
|
|
ff616e9 |
f->archive = _a;
|
|
|
ff616e9 |
f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
|
|
|
ff616e9 |
if (a->filter_first == NULL)
|
|
|
ff616e9 |
@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
|
|
|
ff616e9 |
a->client_data = client_data;
|
|
|
ff616e9 |
|
|
|
ff616e9 |
client_filter = __archive_write_allocate_filter(_a);
|
|
|
ff616e9 |
+
|
|
|
ff616e9 |
+ if (client_filter == NULL)
|
|
|
ff616e9 |
+ return (ARCHIVE_FATAL);
|
|
|
ff616e9 |
+
|
|
|
ff616e9 |
client_filter->open = archive_write_client_open;
|
|
|
ff616e9 |
client_filter->write = archive_write_client_write;
|
|
|
ff616e9 |
client_filter->close = archive_write_client_close;
|
|
|
ff616e9 |
--
|
|
|
ff616e9 |
2.37.3
|
|
|
ff616e9 |
|