diff --git a/extract.c b/extract.c
index a0a4929..9ef80b3 100644
--- a/extract.c
+++ b/extract.c
@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
     ulg eb_ucsize;
     uch *eb_ucptr;
     int r;
+    ush method;
 
     if (compr_offset < 4)                /* field is not compressed: */
         return PK_OK;                    /* do nothing and signal OK */
@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
          eb_size <= (compr_offset + EB_CMPRHEADLEN)))
         return IZ_EF_TRUNC;               /* no compressed data! */
 
+    method = makeword(eb + (EB_HEADSIZE + compr_offset));
+    if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
+        return PK_ERR;            /* compressed & uncompressed
+                                   * should match in STORED
+                                   * method */
+
     if (
 #ifdef INT_16BIT
         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||
/a><a href='/guix/'>summary</a><a href='/guix/refs/?id=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'>refs</a><a class='active' href='/guix/log/NEWS'>log</a><a href='/guix/tree/NEWS?id=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'>tree</a><a href='/guix/commit/NEWS?id=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'>commit</a><a href='/guix/diff/NEWS?id=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/NEWS'>
<input type='hidden' name='id' value='2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'/><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=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'>root</a>/<a href='/guix/log/NEWS?id=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2'>NEWS</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/NEWS?id=2c6464e48b5a786bd8a9a6677aab3f6bbef7dbd2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-07-07 23:54:20 -0400'>2021-07-07</span></td><td><a href='/guix/commit/NEWS?id=4cbe0127a668cbcc64087c5d311308b59d39b104'>guix-install.sh: Prompt for configuring substitutes discovery.</a><span class='msg-avail'>...<span class='msg-tooltip'>Also ensure prompt_yes_no always print the message with a trailing space,
which is more pleasing to the eye.

* etc/guix-daemon.conf.in &lt;--discover=no&gt;: New guix-daemon option.
* etc/guix-daemon.service.in: Likewise.
* etc/init.d/guix-daemon.in: Likewise.
* etc/openrc/guix-daemon.in: Likewise.
* etc/guix-install.sh (configure_substitute_discovery): New procedure.
(sys_enable_guix_daemon): Ask the user whether automatic substitute discovery
should be enabled.  Set the '--discover' argument accordingly.
(prompt_yes_no): Add a trailing space to the message.
(sys_authorize_build_farms): Remove trailing space from the message argument.
* NEWS (Distribution): Add news.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-06-29 14:53:21 -0400'>2021-06-29</span></td><td><a href='/guix/commit/NEWS?id=82daab42811a2e3c7684ebdf12af75ff0fa67b99'>pack: Add support for the deb format.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .dir-locals.el (scheme-mode)[gexp-&gt;derivation]: Define indentation rule.
* guix/scripts/pack.scm (debian-archive): New procedure.
(%formats): Register the new deb format.
(show-formats): Add it to the usage string.
* tests/pack.scm (%ar-bootstrap): New variable.
(deb archive with symlinks): New test.
* doc/guix.texi (Invoking guix pack): Document it.
* NEWS: Add news entry.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-05-10 13:48:30 -0400'>2021-05-10</span></td><td><a href='/guix/commit/NEWS?id=80dc6ad4a89b68b5e837fc22c9b1322b86527bef'>Update NEWS.</a></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-05-10 11:21:02 -0400'>2021-05-10</span></td><td><a href='/guix/commit/NEWS?id=7418a200742768d21b567916b25e4d3351472230'>Update NEWS.</a></td><td>Leo Famulari</td></tr>
<tr><td><span title='2021-05-10 11:42:03 +0200'>2021-05-10</span></td><td><a href='/guix/commit/NEWS?id=3a0fcaa0fe721792d1543e863c3fba805376bdac'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-05-04 16:57:05 +0200'>2021-05-04</span></td><td><a href='/guix/commit/NEWS?id=b37ab28401c55adbb8e36ea2931849636752524d'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-22 20:27:28 +0100'>2020-11-22</span></td><td><a href='/guix/commit/NEWS?id=a099685659b4bfa6b3218f84953cbb7ff9e88063'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-13 09:13:56 +0100'>2020-11-13</span></td><td><a href='/guix/commit/NEWS?id=1e272d42f6217b70c9801b93e46b144e9ab27664'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-09 23:27:09 +0100'>2020-11-09</span></td><td><a href='/guix/commit/NEWS?id=b51da3ccef74e5842b87e39eea839e36831e844e'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-07 19:36:10 +0100'>2020-11-07</span></td><td><a href='/guix/commit/NEWS?id=afa77bd2287f303aefdd00193309ccf57f6dcd93'>Update NEWS.</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-11-07 16:14:03 +0100'>2020-11-07</span></td><td><a href='/guix/commit/NEWS?id=e8b9b0fae076a86e2be1dcb87b666d4490bac0aa'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-05 23:27:22 +0100'>2020-11-05</span></td><td><a href='/guix/commit/NEWS?id=51916455d0bb283489162ef84afc8145b28b012c'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-15 00:02:23 +0200'>2020-04-15</span></td><td><a href='/guix/commit/NEWS?id=d62c9b2671be55ae0305bebfda17b595f33797f2'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-12 17:05:21 +0200'>2020-04-12</span></td><td><a href='/guix/commit/NEWS?id=6945c43754308f64ad177fd29fa515959243f155'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-09 22:56:56 +0200'>2020-04-09</span></td><td><a href='/guix/commit/NEWS?id=f9adf3559543bdbcecad45280c9c626b63e84e95'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-17 11:25:51 +0200'>2019-05-17</span></td><td><a href='/guix/commit/NEWS?id=c34684b6bc32c76b2383cf3641dad1b059fd84fc'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-16 18:52:27 +0200'>2019-05-16</span></td><td><a href='/guix/commit/NEWS?id=22872f766615ed5ae300b6bc1212e3001f46a0e9'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-01 12:10:42 +0200'>2019-05-01</span></td><td><a href='/guix/commit/NEWS?id=6298c3ffd9654d3231a6f25390b056483e8f407c'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-29 11:31:23 +0200'>2019-04-29</span></td><td><a href='/guix/commit/NEWS?id=2f8198dfed1de935dfc60510a5514e5c289c3fc7'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-28 22:57:07 +0200'>2019-04-28</span></td><td><a href='/guix/commit/NEWS?id=7dac61143d9911ad02e239a44b17bd40f06d47a6'>Update NEWS.</a></td><td>Ludovic Courtès</td></tr>