From 4876e3a692739bb9ca00d0f500fd5f4b3eb16ce3 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 7 Sep 2012 11:39:29 -0400
Subject: apply fix for CVE-2012-4409 (thanks to Raphael Geissert)

--- mcrypt-2.6.8/src/extra.c.CVE-2012-4409	2012-09-07 11:00:55.906870746 -0400
+++ mcrypt-2.6.8/src/extra.c	2012-09-07 11:00:27.967858365 -0400
@@ -242,6 +242,8 @@ int check_file_head(FILE * fstream, char
 			if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
 				*salt_size = m_setbit(0, sflag, 0);
 				if (*salt_size > 0) {
+					if (*salt_size > sizeof(tmp_buf))
+						err_quit(_("Salt is too long\n"));
 					fread(tmp_buf, 1, *salt_size,
 					      fstream);
 					memmove(salt, tmp_buf, *salt_size);
 
-- 
cgit v0.12

 value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized 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=0a7962cca0e125f2eb893f781970f0b967da0bc0'>refs</a><a href='/guix/log/gnu/local.mk'>log</a><a href='/guix/tree/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>tree</a><a class='active' href='/guix/commit/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>commit</a><a href='/guix/diff/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/local.mk'>
<input type='hidden' name='id' value='0a7962cca0e125f2eb893f781970f0b967da0bc0'/><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=0a7962cca0e125f2eb893f781970f0b967da0bc0'>root</a>/<a href='/guix/commit/gnu?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>gnu</a>/<a href='/guix/commit/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>local.mk</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='0a7962cca0e125f2eb893f781970f0b967da0bc0'/><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>Ricardo Wurmus &lt;rekado@elephly.net&gt;</td><td class='right'>2022-11-04 09:59:06 +0100</td></tr>
<tr><th>committer</th><td>Ricardo Wurmus &lt;rekado@elephly.net&gt;</td><td class='right'>2022-11-04 10:01:22 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>0a7962cca0e125f2eb893f781970f0b967da0bc0</a> (<a href='/guix/patch/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>b6d110bea6edfc7d653e30a9e14b175227904d9a</a> /<a href='/guix/tree/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>gnu/local.mk</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/local.mk?id=2f6790eb086aab1e0628625b2ecda886700c60cc'>2f6790eb086aab1e0628625b2ecda886700c60cc</a> (<a href='/guix/diff/gnu/local.mk?id=0a7962cca0e125f2eb893f781970f0b967da0bc0&amp;id2=2f6790eb086aab1e0628625b2ecda886700c60cc'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-0a7962cca0e125f2eb893f781970f0b967da0bc0.tar.gz'>guix-0a7962cca0e125f2eb893f781970f0b967da0bc0.tar.gz</a><br/><a href='/guix/snapshot/guix-0a7962cca0e125f2eb893f781970f0b967da0bc0.zip'>guix-0a7962cca0e125f2eb893f781970f0b967da0bc0.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: r-irlba: Update to 2.3.5.1.</div><div class='commit-msg'>* gnu/packages/statistics.scm (r-irlba): Update to 2.3.5.1.
</div><div class='diffstat-header'><a href='/guix/diff/?id=0a7962cca0e125f2eb893f781970f0b967da0bc0'>Diffstat</a> (limited to 'gnu/local.mk')</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>