diff --git a/fileio.c b/fileio.c
index ba0a1d0..03fc4be 100644
--- a/fileio.c
+++ b/fileio.c
@@ -2006,6 +2006,7 @@ int do_string(__G__ length, option)   /* return PK-type error code */
     unsigned comment_bytes_left;
     unsigned int block_len;
     int error=PK_OK;
+    unsigned int length2;
 #ifdef AMIGA
     char tmp_fnote[2 * AMIGA_FILENOTELEN];   /* extra room for squozen chars */
 #endif
@@ -2292,8 +2293,12 @@ int do_string(__G__ length, option)   /* return PK-type error code */
             seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes +
                       (G.inptr-G.inbuf) + length);
         } else {
-            if (readbuf(__G__ (char *)G.extra_field, length) == 0)
+            if ((length2 = readbuf(__G__ (char *)G.extra_field, length)) == 0)
                 return PK_EOF;
+            if(length2 < length) {
+              memset (__G__ (char *)G.extra_field+length2, 0 , length-length2);
+              length = length2;
+            }
             /* Looks like here is where extra fields are read */
             getZip64Data(__G__ G.extra_field, length);
 #ifdef UNICODE_SUPPORT
fs/?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>refs</a><a class='active' href='/guix/log/gnu/packages/graphviz.scm'>log</a><a href='/guix/tree/gnu/packages/graphviz.scm?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>tree</a><a href='/guix/commit/gnu/packages/graphviz.scm?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>commit</a><a href='/guix/diff/gnu/packages/graphviz.scm?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/graphviz.scm'>
<input type='hidden' name='id' value='59d7f4ff0eca8598bc0411b26083916418cd1f9e'/><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=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>root</a>/<a href='/guix/log/gnu?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>gnu</a>/<a href='/guix/log/gnu/packages?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>packages</a>/<a href='/guix/log/gnu/packages/graphviz.scm?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e'>graphviz.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/packages/graphviz.scm?id=59d7f4ff0eca8598bc0411b26083916418cd1f9e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-05-24 15:04:00 +0200'>2023-05-24</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=d5ca1a72436d41fa7a7ab7189c62bff1d9dfc083'>gnu: graphviz: Add "minimal" variant.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-04-26 09:40:16 +0200'>2023-04-26</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=ff4e463ddce78e5ca02de80b594150692c72e66c'>gnu: graphviz: Remove version 2.38.</a><span class='msg-avail'>...</span></td><td>Andreas Enge</td></tr>
<tr><td><span title='2023-04-19 22:50:26 +0200'>2023-04-19</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=3d1b93db65423eb51e37c81d4bcc1243251ce3ae'>gnu: xdot: Complete atk to at-spi2-core transition.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-03-31 14:16:13 +0200'>2023-03-31</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=c000352c27f511dfb5569bef09f9b774d6100117'>gnu: Replace all uses of atk by at-spi2-core.</a><span class='msg-avail'>...</span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2023-03-02 10:55:08 +0000'>2023-03-02</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=7df09ee0ab3e7962ef27859ce87e06a323059284'>Merge remote-tracking branch 'savannah/master' into core-updates</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2023-02-21 17:55:46 +0100'>2023-02-21</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=78a1eee08932e4512885f065d13472acc20e5970'>gnu: python-graphviz: Add native input.</a><span class='msg-avail'>...</span></td><td>Andreas Enge</td></tr>
<tr><td><span title='2023-02-19 01:00:01 +0100'>2023-02-19</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=1e6ddceb8318d413745ca1c9d91fde01b1e0364b'>gnu: Use HTTPS package home pages wherever possible.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-02-20 14:00:38 +0100'>2023-02-20</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=274c59c6bcef78948d2dd519a7c7888fd196667f'>gnu: python-pygraphviz: Update to 1.10.</a><span class='msg-avail'>...</span></td><td>Philippe SWARTVAGHER</td></tr>
<tr><td><span title='2023-01-30 20:07:49 +0200'>2023-01-30</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=e40ccf5fc1b095e708e9900fac0874d87d5dff79'>gnu: texlive-fancyhdr: Use over deprecated texlive-latex-fancyhdr.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2023-01-30 20:07:49 +0200'>2023-01-30</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=bd3e3d87a9246ac59080ebb72298290dca5b0204'>gnu: texlive-graphics: Use over deprecated texlive-latex-graphics.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2023-01-30 12:39:40 +0200'>2023-01-30</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=4cf1acc7f3033b50b0bf19e02c9f522d522d338c'>Merge remote-tracking branch 'origin/master' into core-updates</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-12-13 00:07:22 +0100'>2022-12-13</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=3d388fe3d0475f2e991ae061cc1364529a97af42'>gnu: python-graphviz: Update to 0.20.1.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-11-20 14:09:23 -0500'>2022-11-20</span></td><td><a href='/guix/commit/gnu/packages/graphviz.scm?id=59ddb7480343a5206c7e252e8436d73d868f6de1'>gnu: graphviz: Update to 7.0.1 and remove input labels.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>