libarchive/trunk/0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch

   1 From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
   2 From: obiwac <obiwac@gmail.com>
   3 Date: Fri, 22 Jul 2022 22:41:10 +0200
   4 Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
   5
   6 ---
   7  libarchive/archive_write.c | 8 ++++++++
   8  1 file changed, 8 insertions(+)
   9
  10 diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
  11 index 66592e82..27626b54 100644
  12 --- a/libarchive/archive_write.c
  13 +++ b/libarchive/archive_write.c
  14 @@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
  15         struct archive_write_filter *f;
  16
  17         f = calloc(1, sizeof(*f));
  18 +
  19 +       if (f == NULL)
  20 +               return (NULL);
  21 +
  22         f->archive = _a;
  23         f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
  24         if (a->filter_first == NULL)
  25 @@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
  26         a->client_data = client_data;
  27
  28         client_filter = __archive_write_allocate_filter(_a);
  29 +
  30 +       if (client_filter == NULL)
  31 +               return (ARCHIVE_FATAL);
  32 +
  33         client_filter->open = archive_write_client_open;
  34         client_filter->write = archive_write_client_write;
  35         client_filter->close = archive_write_client_close;