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));
zed Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>refs</a><a href='/guix/log/gnu/packages/scribus.scm'>log</a><a href='/guix/tree/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>tree</a><a class='active' href='/guix/commit/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>commit</a><a href='/guix/diff/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/scribus.scm'>
<input type='hidden' name='id' value='7b7b8c909bdfc3f281d6fd5f40784c46c795c014'/><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/commit/?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>root</a>/<a href='/guix/commit/gnu?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>gnu</a>/<a href='/guix/commit/gnu/packages?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>packages</a>/<a href='/guix/commit/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>scribus.scm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='7b7b8c909bdfc3f281d6fd5f40784c46c795c014'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2021-06-27 16:14:21 +0200</td></tr>
<tr><th>committer</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2021-07-11 00:49:15 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>7b7b8c909bdfc3f281d6fd5f40784c46c795c014</a> (<a href='/guix/patch/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>980a58d4636f8ce41f60220f82db78379fd87d3b</a> /<a href='/guix/tree/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>gnu/packages/scribus.scm</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/packages/scribus.scm?id=f23803af2018a148fb088f2516d79c20d6bf95f0'>f23803af2018a148fb088f2516d79c20d6bf95f0</a> (<a href='/guix/diff/gnu/packages/scribus.scm?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014&amp;id2=f23803af2018a148fb088f2516d79c20d6bf95f0'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-7b7b8c909bdfc3f281d6fd5f40784c46c795c014.tar.gz'>guix-7b7b8c909bdfc3f281d6fd5f40784c46c795c014.tar.gz</a><br/><a href='/guix/snapshot/guix-7b7b8c909bdfc3f281d6fd5f40784c46c795c014.zip'>guix-7b7b8c909bdfc3f281d6fd5f40784c46c795c014.zip</a><br/></td></tr></table>
<div class='commit-subject'>packages: 'hidden-package' inherits the original package location.</div><div class='commit-msg'>* guix/packages.scm (hidden-package): Inherit 'location' from P.
</div><div class='diffstat-header'><a href='/guix/diff/?id=7b7b8c909bdfc3f281d6fd5f40784c46c795c014'>Diffstat</a> (limited to 'gnu/packages/scribus.scm')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>