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));
d>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>refs</a><a class='active' href='/guix/log/gnu/services/vpn.scm'>log</a><a href='/guix/tree/gnu/services/vpn.scm?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>tree</a><a href='/guix/commit/gnu/services/vpn.scm?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>commit</a><a href='/guix/diff/gnu/services/vpn.scm?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/vpn.scm'>
<input type='hidden' name='id' value='cd7bd1cc8f1caf63902b2281d7926862e6c31827'/><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=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>root</a>/<a href='/guix/log/gnu?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>gnu</a>/<a href='/guix/log/gnu/services?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>services</a>/<a href='/guix/log/gnu/services/vpn.scm?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827'>vpn.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/services/vpn.scm?id=cd7bd1cc8f1caf63902b2281d7926862e6c31827&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-02-17 10:32:15 +0100'>2021-02-17</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=43b2e440c38a39eb64088bd6c08771c060aa10fc'>services: wireguard: New service.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-11-18 15:05:41 +0100'>2020-11-18</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=5221df34149465c5bbc1a76f83cb09f8911279f5'>gnu: vpn: Make ca, key and cert optional.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-02-19 04:08:55 +0100'>2020-02-19</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=c6c447701c9cfdeedf77224399faa9c07b12d045'>gnu: services: Add openvpn options.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-02-19 04:08:40 +0100'>2020-02-19</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=0372dd1a1e51e39382ee5d1aa968589b40506b8f'>gnu: services: Fix openvpn boolean fields.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>