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]));
     }
0e190e717a20cdb21df297f'>refs</a><a class='active' href='/guix/log/doc/htmlxref.cnf'>log</a><a href='/guix/tree/doc/htmlxref.cnf?id=a48d6acc23f426ca70e190e717a20cdb21df297f'>tree</a><a href='/guix/commit/doc/htmlxref.cnf?id=a48d6acc23f426ca70e190e717a20cdb21df297f'>commit</a><a href='/guix/diff/doc/htmlxref.cnf?id=a48d6acc23f426ca70e190e717a20cdb21df297f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/htmlxref.cnf'>
<input type='hidden' name='id' value='a48d6acc23f426ca70e190e717a20cdb21df297f'/><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=a48d6acc23f426ca70e190e717a20cdb21df297f'>root</a>/<a href='/guix/log/doc?id=a48d6acc23f426ca70e190e717a20cdb21df297f'>doc</a>/<a href='/guix/log/doc/htmlxref.cnf?id=a48d6acc23f426ca70e190e717a20cdb21df297f'>htmlxref.cnf</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/doc/htmlxref.cnf?id=a48d6acc23f426ca70e190e717a20cdb21df297f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-07-05 22:16:10 +0200'>2018-07-05</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=c35f77c5a07690fc9d369ed4b751a5a9e5de6cf1'>doc: Update URL of the Emacs-Guix manual.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-07-05 22:13:23 +0200'>2018-07-05</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=56b4dabc2ba3446ff212e0d4d9e2df15fc25e88f'>doc: Mention translations of the manual.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-30 18:30:39 +0300'>2017-05-30</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=f753c2829913a9bb61dc266f4b1db8275e34a461'>doc: htmlxref: Fix link to Emacs-Guix manual.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2017-05-04 22:45:53 +0300'>2017-05-04</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=8ca0c88a894c685b624757e38ee7663534f03460'>doc: Add references to Emacs-Guix manual.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2016-12-29 23:40:24 +0300'>2016-12-29</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=deb6276dda81a69da38e842d269c5370a28fa5cf'>Remove Emacs interface.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2016-08-03 16:00:09 +0200'>2016-08-03</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=1eb43cc30b78436414e3ca55ba44c70c27bf21aa'>doc: Update Texinfo HTML cross-reference file..</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-03-30 23:39:47 +0200'>2016-03-30</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=d006e307b955f1bf497d15c3ba23597516910ba0'>doc: Fix URL of gnutls-guile one-page-per-node manual.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-02-21 22:28:20 +0100'>2016-02-21</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=49e0ca90bcccf01eca34b1e781b70b1560915c57'>doc: Add Texinfo HTML cross-reference file.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>