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));
t/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=d0a5503752cab62efbaa06bd00fb92145e015732'>refs</a><a class='active' href='/guix/log/bootstrap'>log</a><a href='/guix/tree/bootstrap?id=d0a5503752cab62efbaa06bd00fb92145e015732'>tree</a><a href='/guix/commit/bootstrap?id=d0a5503752cab62efbaa06bd00fb92145e015732'>commit</a><a href='/guix/diff/bootstrap?id=d0a5503752cab62efbaa06bd00fb92145e015732'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/bootstrap'>
<input type='hidden' name='id' value='d0a5503752cab62efbaa06bd00fb92145e015732'/><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=d0a5503752cab62efbaa06bd00fb92145e015732'>root</a>/<a href='/guix/log/bootstrap?id=d0a5503752cab62efbaa06bd00fb92145e015732'>bootstrap</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/bootstrap?id=d0a5503752cab62efbaa06bd00fb92145e015732&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-17 11:49:08 +0100'>2020-02-17</span></td><td><a href='/guix/commit/bootstrap?id=3dd311e3a059131ef245417106d4fb659222ef3c'>bootstrap: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* bootstrap: Substitute ‘guix-cookbook’ for copy/pasted ‘guix-manual’.

Reported-by: jetomit on #guix
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-09-18 11:38:14 +0200'>2019-09-18</span></td><td><a href='/guix/commit/bootstrap?id=7bc46ecc34ceb042ff890e5d306d0a2a736e891d'>doc: Add Guix Cookbook.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .gitignore: Update ignore list.
* Makefile.am (assert-no-store-file-names): Exclude the cookbook.
* bootstrap: Generate po files for cookbook translations.
* doc/guix-cookbook.texi: New file.
* doc/local.mk (info_TEXINFOS): Add it; add a rule to build cookbook
translations.
* po/doc/local.mk (DOC_COOKBOOK_PO_FILES): New variable.
(EXTRA_DIST): Add cookbook pot file and po files.
(doc-po-update-cookbook-%): New target.
(doc-pot-update): Also update cookbook pot file.
(doc-po-update): Also update cookbook po files.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-04-26 11:21:32 +0200'>2019-04-26</span></td><td><a href='/guix/commit/bootstrap?id=9ca5ff882e2ac4eaab02eb0fde545bd784af478b'>bootstrap: Break automake dependency on generated files.</a><span class='msg-avail'>...<span class='msg-tooltip'>* bootstrap: Generate stub files for the manual translations whose
generated files are not included in the VCS.
* doc/contributing.de.texi: Remove file.
* doc/contributing.es.texi: Remove file.
* doc/contributing.fr.texi: Remove file.
* doc/contributing.zh_CN.texi: Remove file.
* doc/guix.de.texi: Remove file.
* doc/guix.es.texi: Remove file.
* doc/guix.fr.texi: Remove file.
* doc/guix.zh_CN.texi: Remove file.
* .gitignore: Add them.

Signed-off-by: Julien Lepiller &lt;julien@lepiller.eu&gt;
</span></span></td><td>Miguel Ángel Arruga Vivas</td></tr>
<tr><td><span title='2014-12-19 23:18:49 +0100'>2014-12-19</span></td><td><a href='/guix/commit/bootstrap?id=9ac97e83e9d8bef310b5353c64505498c9d16ce7'>Remove 'nix-upstream' submodule.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/sync-with-upstream: Remove.
* bootstrap: Remove uses of 'git submodule' and 'sync-with-usptream'.
* .gitmodules: Remove.
</span></span></td><td>Ludovic Courtès</td></tr>