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));
ss='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>refs</a><a class='active' href='/guix/log/nix/nix-daemon/nix-daemon.cc'>log</a><a href='/guix/tree/nix/nix-daemon/nix-daemon.cc?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>tree</a><a href='/guix/commit/nix/nix-daemon/nix-daemon.cc?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>commit</a><a href='/guix/diff/nix/nix-daemon/nix-daemon.cc?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/nix-daemon/nix-daemon.cc'>
<input type='hidden' name='id' value='7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'/><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=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>root</a>/<a href='/guix/log/nix?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>nix</a>/<a href='/guix/log/nix/nix-daemon?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>nix-daemon</a>/<a href='/guix/log/nix/nix-daemon/nix-daemon.cc?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a'>nix-daemon.cc</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/nix/nix-daemon/nix-daemon.cc?id=7e64097a9da4d5a4032aeae526cb6fbcb0c12e5a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-11 23:18:53 +0100'>2023-12-11</span></td><td><a href='/guix/commit/nix/nix-daemon/nix-daemon.cc?id=1e47148f46e31eb99ce8ec7bc12232cf50d0ebec'>daemon: Implement ‘substitute-urls’ RPC.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump.
(WorkerOp): Add ‘wopSubstituteURLs’.
* nix/nix-daemon/nix-daemon.cc (performOp): Implement it.
* guix/store.scm (%protocol-version): Bump.
(operation-id): Add ‘substitute-urls’.
(substitute-urls): New procedure.
* tests/store.scm ("substitute-urls, default")
("substitute-urls, client-specified URLs")
("substitute-urls, disabled"): New tests.

Change-Id: I2c0119500c3a1eecfa5ebf32463ffb0f173161de
</span></span></td><td>Ludovic Courtès</td></tr>