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) ||
<td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>refs</a><a class='active' href='/guix/log/build-aux/test-env.in'>log</a><a href='/guix/tree/build-aux/test-env.in?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>tree</a><a href='/guix/commit/build-aux/test-env.in?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>commit</a><a href='/guix/diff/build-aux/test-env.in?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/test-env.in'>
<input type='hidden' name='id' value='44462b1acf4102d485e8477b214f6ca8cd1a7d83'/><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=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>root</a>/<a href='/guix/log/build-aux?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>build-aux</a>/<a href='/guix/log/build-aux/test-env.in?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83'>test-env.in</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/test-env.in?id=44462b1acf4102d485e8477b214f6ca8cd1a7d83&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=a1aaca314ca94700ebe3449d6bd73522f2d243bc'>build: Remove references to 'NIX_LOCALSTATE_DIR'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/test-env.in: Remove references to 'NIX_LOCALSTATE_DIR'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=47e99e626b46b2fc433506a822d251de68ad6241'>daemon: Remove traces of 'NIX_ROOT_FINDER'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.

* build-aux/test-env.in: Remove mentions of 'NIX_ROOT_FINDER'.
* nix/libstore/gc.cc (LocalStore::collectGarbage): Adjust comment
accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-04 00:03:30 +0100'>2019-02-04</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=a87d66f371da2a84d7bba1cae58b71c9c9af73aa'>daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' environment variables.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/22459&gt;.
Reported by Jeff Mickey &lt;j@codemac.net&gt;.

* guix/config.scm.in (%state-directory): Change NIX_STATE_DIR to
GUIX_STATE_DIRECTORY.
(%store-database-directory): Change NIX_DB_DIR to
GUIX_DATABASE_DIRECTORY.
* nix/libstore/globals.cc (Settings::processEnvironment): Likewise.
* guix/self.scm (make-config.scm): Likewise.
* build-aux/build-self.scm (make-config.scm): Likewise.
* build-aux/test-env.in: Likewise.
* tests/derivations.scm ("derivation #:leaked-env-vars"): Likewise.
* tests/guix-build.sh (GUIX_DAEMON_SOCKET): Likewise.
* tests/guix-daemon.sh (socket): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>