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));
<td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>refs</a><a class='active' href='/guix/log/gnu/packages/xiph.scm'>log</a><a href='/guix/tree/gnu/packages/xiph.scm?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>tree</a><a href='/guix/commit/gnu/packages/xiph.scm?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>commit</a><a href='/guix/diff/gnu/packages/xiph.scm?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/xiph.scm'>
<input type='hidden' name='id' value='0105b8624dbba539677ebbfd0dc0bd35143c6fad'/><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=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>root</a>/<a href='/guix/log/gnu?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>gnu</a>/<a href='/guix/log/gnu/packages?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>packages</a>/<a href='/guix/log/gnu/packages/xiph.scm?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad'>xiph.scm</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/xiph.scm?id=0105b8624dbba539677ebbfd0dc0bd35143c6fad&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-06 01:04:47 +0200'>2020-10-06</span></td><td><a href='/guix/commit/gnu/packages/xiph.scm?id=d3b9cbd9c8728f977aa12708d0b034e609f07436'>gnu: libshout: Update to 2.4.4.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-07-25 18:47:55 +0200'>2020-07-25</span></td><td><a href='/guix/commit/gnu/packages/xiph.scm?id=9ff9a64dd19d6976a7f46549097d2e063dd34d85'>gnu: ao: Update source URI.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-06-27 20:08:22 +0200'>2020-06-27</span></td><td><a href='/guix/commit/gnu/packages/xiph.scm?id=75ebc650c8a4e0f5b51a510891c22e2a39268142'>gnu: opusfile: Do not build static libraries.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-06-27 20:08:22 +0200'>2020-06-27</span></td><td><a href='/guix/commit/gnu/packages/xiph.scm?id=fb6b40b02e1a3bd46d567508c4f00e17834dd5c6'>gnu: opusfile: Update to 0.12.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>