Copied from Debian.

From: Petr Stodulka <pstodulk@redhat.com>
Date: Mon, 14 Sep 2015 18:23:17 +0200
Subject: Upstream fix for heap overflow
Bug-Debian: https://bugs.debian.org/802162
Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944
Origin: https://bugzilla.redhat.com/attachment.cgi?id=1073002
Forwarded: yes

---
 crypt.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- a/crypt.c
+++ b/crypt.c
@@ -465,7 +465,17 @@
     GLOBAL(pInfo->encrypted) = FALSE;
     defer_leftover_input(__G);
     for (n = 0; n < RAND_HEAD_LEN; n++) {
-        b = NEXTBYTE;
+        /* 2012-11-23 SMS.  (OUSPG report.)
+         * Quit early if compressed size < HEAD_LEN.  The resulting
+         * error message ("unable to get password") could be improved,
+         * but it's better than trying to read nonexistent data, and
+         * then continuing with a negative G.csize.  (See
+         * fileio.c:readbyte()).
+         */
+        if ((b = NEXTBYTE) == (ush)EOF)
+        {
+            return PK_ERR;
+        }
         h[n] = (uch)b;
         Trace((stdout, " (%02x)", h[n]));
     }
fs/?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>refs</a><a class='active' href='/guix/log/build-aux/hydra/evaluate.scm'>log</a><a href='/guix/tree/build-aux/hydra/evaluate.scm?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>tree</a><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>commit</a><a href='/guix/diff/build-aux/hydra/evaluate.scm?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/hydra/evaluate.scm'>
<input type='hidden' name='id' value='c43f5b800149db792b75ac7c78c5f2aad89f83c4'/><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=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>root</a>/<a href='/guix/log/build-aux?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>build-aux</a>/<a href='/guix/log/build-aux/hydra?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>hydra</a>/<a href='/guix/log/build-aux/hydra/evaluate.scm?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4'>evaluate.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/build-aux/hydra/evaluate.scm?id=c43f5b800149db792b75ac7c78c5f2aad89f83c4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-04-08 17:48:33 +0200'>2018-04-08</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=9fe95946118e9530504699360b1ca3507fa0360d'>hydra: 'guix-modular' jobs use the new 'build-self'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/guix-modular.scm: Remove 'eval-when' form that fiddled
with '%load-path'.
(build-job): Load 'build-aux/build-self.scm' and call the procedure it
returns.
* build-aux/hydra/evaluate.scm: The 'build-things' replacement no longer
calls 'exit'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-11-21 23:09:16 +0100'>2017-11-21</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=49961951c53df7728e77f69f7bbae88759ce51fb'>hydra: 'evaluate' passes an alist to the entry point.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm (%top-srcdir): New variable.
&lt;top level&gt;: Pass it to 'hydra-jobs'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-09-28 17:39:54 +0200'>2017-09-28</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=454caca8e6db34d7777ddb4ba84680d41e381b32'>cuirass: Add 'cuirass-jobs.scm' target to compute the Cuirass jobs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm: Support "cuirass" command line option.
* Makefile.am (cuirass-jobs.scm): New target.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2017-05-07 00:18:36 +0200'>2017-05-07</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=7f4da8ff6b382dce49954f272afc219b1ad4db20'>maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm: Add 'time-monotonic' workaround for
Guile 2.2.
</span></span></td><td>Ludovic Courtès</td></tr>