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));
/a><a href='/guix/refs/'>refs</a><a class='active' href='/guix/log/guix/scripts/archive.scm?showmsg=1'>log</a><a href='/guix/tree/guix/scripts/archive.scm'>tree</a><a href='/guix/commit/guix/scripts/archive.scm'>commit</a><a href='/guix/diff/guix/scripts/archive.scm'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/guix/scripts/archive.scm'>
<input type='hidden' name='showmsg' value='1'/><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/?showmsg=1'>root</a>/<a href='/guix/log/guix?showmsg=1'>guix</a>/<a href='/guix/log/guix/scripts?showmsg=1'>scripts</a>/<a href='/guix/log/guix/scripts/archive.scm?showmsg=1'>archive.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/guix/scripts/archive.scm'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-10-17 14:51:53 +0200'>2023-10-17</span></td><td class='logsubject'><a href='/guix/commit/guix/scripts/archive.scm?id=b53742def399969042f477181cae2637ef3a3842'>scripts: archive: Handle EPIPE errors when displaying help.</a></td><td>Simon Tournier</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/archive.scm (%options): Handle EPIPE errors when displaying
help.


</td></tr>
<tr class='logheader'><td><span title='2023-09-28 11:44:09 +0200'>2023-09-28</span></td><td class='logsubject'><a href='/guix/commit/guix/scripts/archive.scm?id=c6eed13c8713c7d56d148afad9facded5ebb8a1f'>archive: Fix ‘--version’ typo.</a></td><td>Nikolaos Chatzikonstantinou</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/archive.scm (%options): Replace 'build' by 'archive'.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2023-03-13 15:08:33 +0100'>2023-03-13</span></td><td class='logsubject'><a href='/guix/commit/guix/scripts/archive.scm?id=ae587c2ef041413bc709a555261db752068ea360'>guix: Strip #:use-module lists.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This was obtained by setting up this environment:

  guix shell -D guix --with-input=guile@3.0.9=guile-next \
    --with-commit=guile-next=e2ed33ef0445c867fe56c247054aa67e834861f2
    -- make -j5

then adding 'unused-module' to (@@ (guix build compiler) %warnings),
building, and checking all the "unused module" warnings and removing
those that were definitely unused.


</td></tr>