We omit the ChangeLog changes below, since they do not apply cleanly.


From 6ee5059cd3ac8d82714a1ab1321399b88539abf0 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 30 Nov 2020 16:26:59 +0000
Subject: [PATCH] possible TIFF related-heap buffer overflow (alert & POC by
 Hardik Shah)

---
 ChangeLog     | 6 ++++++
 coders/tiff.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/coders/tiff.c b/coders/tiff.c
index e98f927ab..1eecf17ae 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1975,7 +1975,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         extent+=image->columns*sizeof(uint32);
 #endif
         strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
-          sizeof(*strip_pixels));
+          2*sizeof(*strip_pixels));
         if (strip_pixels == (unsigned char *) NULL)
           ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
         (void) memset(strip_pixels,0,extent*sizeof(*strip_pixels));
b right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/unzip-alt-iconv-utf8.patch'>log</a><a href='/guix/tree/gnu/packages/patches/unzip-alt-iconv-utf8.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>tree</a><a href='/guix/commit/gnu/packages/patches/unzip-alt-iconv-utf8.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>commit</a><a href='/guix/diff/gnu/packages/patches/unzip-alt-iconv-utf8.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/unzip-alt-iconv-utf8.patch'>
<input type='hidden' name='id' value='1bd44b425b79e9da160b33a9b19d01973b44772e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>root</a>/<a href='/guix/log/gnu?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>gnu</a>/<a href='/guix/log/gnu/packages?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>patches</a>/<a href='/guix/log/gnu/packages/patches/unzip-alt-iconv-utf8.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>unzip-alt-iconv-utf8.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/unzip-alt-iconv-utf8.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-03-14 06:11:20 +0100'>2021-03-14</span></td><td><a href='/guix/commit/gnu/packages/patches/unzip-alt-iconv-utf8.patch?id=31d289a4759909d24dd309ac24d42902a8c20da0'>gnu: unzip: Add patches from Fedora [security fixes].</a><span class='msg-avail'>...<span class='msg-tooltip'>Non-exhaustively fixes CVE-2016-9844, CVE-2018-1000035, CVE-2018-18384, and
CVE-2019-13232.

* gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch,
gnu/packages/patches/unzip-CVE-2016-9844.patch,
gnu/packages/patches/unzip-CVE-2018-1000035.patch,
gnu/packages/patches/unzip-CVE-2018-18384.patch,
gnu/packages/patches/unzip-case-insensitive.patch,
gnu/packages/patches/unzip-alt-iconv-utf8-print.patch,
gnu/packages/patches/unzip-alt-iconv-utf8.patch,
gnu/packages/patches/unzip-close.patch,
gnu/packages/patches/unzip-exec-shield.patch,
gnu/packages/patches/unzip-fix-recmatch.patch,
gnu/packages/patches/unzip-manpage-fix.patch,
gnu/packages/patches/unzip-overflow.patch,
gnu/packages/patches/unzip-symlink.patch,
gnu/packages/patches/unzip-timestamp.patch,
gnu/packages/patches/unzip-valgrind.patch,
gnu/packages/patches/unzip-x-option.patch,
gnu/packages/patches/unzip-zipbomb-manpage.patch,
gnu/packages/patches/unzip-zipbomb-part1.patch,
gnu/packages/patches/unzip-zipbomb-part2.patch,
gnu/packages/patches/unzip-zipbomb-part3.patch: New patches.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/compression.scm (unzip/fixed): New variable. Apply patches.
(unzip)[replacement]: Graft.
</span></span></td><td>Léo Le Bouter</td></tr>