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

ed'>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=c706a0a2afd6ea2fa1905758970797cddeb150a3'>refs</a><a class='active' href='/guix/log/CODE-OF-CONDUCT'>log</a><a href='/guix/tree/CODE-OF-CONDUCT?id=c706a0a2afd6ea2fa1905758970797cddeb150a3'>tree</a><a href='/guix/commit/CODE-OF-CONDUCT?id=c706a0a2afd6ea2fa1905758970797cddeb150a3'>commit</a><a href='/guix/diff/CODE-OF-CONDUCT?id=c706a0a2afd6ea2fa1905758970797cddeb150a3'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/CODE-OF-CONDUCT'>
<input type='hidden' name='id' value='c706a0a2afd6ea2fa1905758970797cddeb150a3'/><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=c706a0a2afd6ea2fa1905758970797cddeb150a3'>root</a>/<a href='/guix/log/CODE-OF-CONDUCT?id=c706a0a2afd6ea2fa1905758970797cddeb150a3'>CODE-OF-CONDUCT</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/CODE-OF-CONDUCT?id=c706a0a2afd6ea2fa1905758970797cddeb150a3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>