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) ||
bs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>refs</a><a class='active' href='/guix/log/nix/libstore/store-api.cc'>log</a><a href='/guix/tree/nix/libstore/store-api.cc?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>tree</a><a href='/guix/commit/nix/libstore/store-api.cc?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>commit</a><a href='/guix/diff/nix/libstore/store-api.cc?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/store-api.cc'>
<input type='hidden' name='id' value='889eebc1854145e6895bb8b50fc36d07a194c1fb'/><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=889eebc1854145e6895bb8b50fc36d07a194c1fb'>root</a>/<a href='/guix/log/nix?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>nix</a>/<a href='/guix/log/nix/libstore?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>libstore</a>/<a href='/guix/log/nix/libstore/store-api.cc?id=889eebc1854145e6895bb8b50fc36d07a194c1fb'>store-api.cc</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/nix/libstore/store-api.cc?id=889eebc1854145e6895bb8b50fc36d07a194c1fb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-13 00:44:01 +0200'>2019-06-13</span></td><td><a href='/guix/commit/nix/libstore/store-api.cc?id=76533c52c06de4823738b32e450a1a06522018d1'>daemon: Replace "illegal" by "invalid" in error messages.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc (parseReferenceSpecifiers): Replace "illegal" by
"invalid".
* nix/libstore/globals.cc (Settings::pack): Likewise.
* nix/libstore/store-api.cc (checkStoreName): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-16 16:28:07 +0100'>2018-12-16</span></td><td><a href='/guix/commit/nix/libstore/store-api.cc?id=8327e733966cc4a93dfaadd1a761ca1088078baa'>daemon: Use unbranded phrases in comments and messages.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc, nix/libstore/globals.cc,
nix/libstore/gc.cc, nix/libstore/local-store.cc,
nix/libstore/optimise-store.cc, nix/libstore/store-api.cc,
nix/libutil/archive.cc, nix/nix-daemon/nix-daemon.cc: Replace "Nix
store" by "store", and "Nix daemon" by "build daemon".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/nix/libstore/store-api.cc?id=ea0a06cee2ba05451f94714a4f913db02efbe92c'>Remove 'guix-register' and its traces.</a><span class='msg-avail'>...<span class='msg-tooltip'>* Makefile.am (SH_TESTS): Remove tests/guix-register.sh.
* build-aux/pre-inst-env.in (GUIX_REGISTER): Remove.
* gnu/build/install.scm (directives): Remove outdated comment.
* gnu/build/vm.scm (root-partition-initializer): Update comment.
* gnu/packages/package-management.scm (guix-register): Remove.
* guix/config.scm.in (%sbindir, %guix-register-program): Remove.
* guix/scripts/system.scm (install): Adjust docstring.
* guix/self.scm (make-config.scm): Remove #:guix.  Do not generate
%sbindir and %guix-register-program.
(specification-&gt;package): Remove "guix".
* nix/guix-register/guix-register.cc: Remove.
* nix/libstore/store-api.cc (decodeValidPathInfo): Remove.
* nix/libstore/store-api.hh (decodeValidPathInfo): Remove declaration.
* nix/local.mk (sbin_PROGRAMS, guix_register_SOURCES)
(guix_register_CPPFLAGS, guix_register_LDFLAGS): Remove.
* tests/guix-register.sh: Remove.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-30 23:42:07 +0200'>2018-03-30</span></td><td><a href='/guix/commit/nix/libstore/store-api.cc?id=c7589cce8d3f9fcb7769e424f341dba8fb3545d0'>daemon: Remove dead code.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/globals.cc (Settings::loadConfFile, Settings::unpack):
Remove.
* nix/libstore/globals.hh: Adjust accordingly.
* nix/libstore/misc.cc (queryMissing): Remove.
* nix/libstore/misc.hh: Adjust accordingly.
* nix/libstore/store-api.cc (followLinksToStore)
(followLinksToStorePath, computeStorePathForHash): Remove.
* nix/libstore/store-api.hh: Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>