From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 27 May 2019 08:20:32 -0700
Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state.

---
 fileio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fileio.c b/fileio.c
index c042987..bc00d74 100644
--- a/fileio.c
+++ b/fileio.c
@@ -530,8 +530,10 @@ void undefer_input(__G)
          * This condition was checked when G.incnt_leftover was set > 0 in
          * defer_leftover_input(), and it is NOT allowed to touch G.csize
          * before calling undefer_input() when (G.incnt_leftover > 0)
-         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
+         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
          */
+        if (G.csize < 0L)
+            G.csize = 0L;
         G.incnt = G.incnt_leftover + (int)G.csize;
         G.inptr = G.inptr_leftover - (int)G.csize;
         G.incnt_leftover = 0;
'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>refs</a><a class='active' href='/guix/log/tests/keys/ed25519.sec'>log</a><a href='/guix/tree/tests/keys/ed25519.sec?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>tree</a><a href='/guix/commit/tests/keys/ed25519.sec?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>commit</a><a href='/guix/diff/tests/keys/ed25519.sec?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/keys/ed25519.sec'>
<input type='hidden' name='id' value='f814d33cbd3bd6f4a6c330ed0e93a214b887f401'/><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=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>root</a>/<a href='/guix/log/tests?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>tests</a>/<a href='/guix/log/tests/keys?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>keys</a>/<a href='/guix/log/tests/keys/ed25519.sec?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>ed25519.sec</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/tests/keys/ed25519.sec?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-22 10:53:19 +0100'>2021-12-22</span></td><td><a href='/guix/commit/tests/keys/ed25519.sec?id=9ebc9ca070a21ba0aeb3f61202a8071bb250ccc8'>tests: Move keys into ./tests/keys/ and add a third ed25519 key.</a><span class='msg-avail'>...<span class='msg-tooltip'>The third key will be used in an upcoming commit.

Rename public keys to .pub.

* guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable.
(%ed25519-3-secret-key-file): New variable.
(%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file.
(%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file.
* tests/keys/ed25519-3.key: New file.
* tests/keys/ed25519-3.sec: New file.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Attila Lendvai</td></tr>