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) ||
r></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=8771fc1715b400ead16f97683c67ad336b485750'>refs</a><a class='active' href='/guix/log/gnu/ci.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/ci.scm?id=8771fc1715b400ead16f97683c67ad336b485750'>tree</a><a href='/guix/commit/gnu/ci.scm?id=8771fc1715b400ead16f97683c67ad336b485750'>commit</a><a href='/guix/diff/gnu/ci.scm?id=8771fc1715b400ead16f97683c67ad336b485750'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/ci.scm'>
<input type='hidden' name='id' value='8771fc1715b400ead16f97683c67ad336b485750'/><input type='hidden' name='showmsg' value='1'/><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=8771fc1715b400ead16f97683c67ad336b485750&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=8771fc1715b400ead16f97683c67ad336b485750&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/ci.scm?id=8771fc1715b400ead16f97683c67ad336b485750&amp;showmsg=1'>ci.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/gnu/ci.scm?id=8771fc1715b400ead16f97683c67ad336b485750'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-01-21 10:19:31 +0100'>2019-01-21</span></td><td class='logsubject'><a href='/guix/commit/gnu/ci.scm?id=c680a7daa5e143dd37d1d045805e073497c591be'>ci: Skip system tests on armhf-linux.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/ci.scm (system-test-jobs): Return the empty list when SYSTEM is
"armhf-linux".


</td></tr>
<tr class='logheader'><td><span title='2019-01-20 01:42:11 +0100'>2019-01-20</span></td><td class='logsubject'><a href='/guix/commit/gnu/ci.scm?id=7e6d8d366a61f951936ed83371877ce006f679f6'>ci: Use a valid 'current-guix'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This fixes a regression introduced in
b5f8c2c88543158e8aca76aa98f9009f6b9e743a whereby 'current-guix' (needed
by some of the system tests) would fail to build.
Reported by Ricardo Wurmus &lt;rekado@elephly.net&gt;.

It also speeds up compilation of 'current-guix' since the channel
instance is already compiled or can be built quickly compared to the
default 'current-guix'.

* gnu/packages/package-management.scm (current-guix-package): New
variable.
(current-guix): Honor it.
* gnu/ci.scm (channel-build-system): New variable.
(channel-instances-&gt;derivation): New procedure.
(system-test-jobs): Add #:source and #:commit parameters.
Define 'instance' and parameterize CURRENT-GUIX-PACKAGE.
(hydra-jobs)[checkout, commit, source]: New variables.
Pass #:source and #:commit to 'system-test-jobs'.


</td></tr>
<tr class='logheader'><td><span title='2019-01-06 21:41:07 +0100'>2019-01-06</span></td><td class='logsubject'><a href='/guix/commit/gnu/ci.scm?id=b5f8c2c88543158e8aca76aa98f9009f6b9e743a'>hydra: Compute jobs in an inferior.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Previously we would rely on auto-compilation of all the Guix modules.
The complete evaluation would take ~15mn on berlin.guixsd.org and
require lots of RAM.  This approach should be faster since potentially
only part of the modules are rebuilt.  Furthermore, as a side-effect, it
builds the derivations that 'guix pull' uses.

* build-aux/hydra/gnu-system.scm: Remove 'eval-when' form.
(hydra-jobs): New procedure.
* gnu/ci.scm (package-&gt;alist, qemu-jobs, system-test-jobs)
(tarball-jobs): Return strings for the 'license' field.
* guix/self.scm (compiled-guix)[*cli-modules*]: Add (gnu ci).


</td></tr>
<tr class='logheader'><td><span title='2019-01-06 21:41:07 +0100'>2019-01-06</span></td><td class='logsubject'><a href='/guix/commit/gnu/ci.scm?id=59fb5c1cdb6fa5d6d1dbeca58e33f4a01a7d98f8'>hydra: Move job definitions to (gnu ci).</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* build-aux/hydra/gnu-system.scm: Move code to...
* gnu/ci.scm: ... here.  New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.


</td></tr>