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;
r><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>refs</a><a class='active' href='/guix/log/gnu/services/dns.scm'>log</a><a href='/guix/tree/gnu/services/dns.scm?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>tree</a><a href='/guix/commit/gnu/services/dns.scm?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>commit</a><a href='/guix/diff/gnu/services/dns.scm?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/dns.scm'>
<input type='hidden' name='id' value='da34a19f3af425b5596c09fb388f0a2ee04d4bba'/><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=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>root</a>/<a href='/guix/log/gnu?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>gnu</a>/<a href='/guix/log/gnu/services?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>services</a>/<a href='/guix/log/gnu/services/dns.scm?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba'>dns.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/services/dns.scm?id=da34a19f3af425b5596c09fb388f0a2ee04d4bba&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-08-30 01:19:47 +0300'>2018-08-30</span></td><td><a href='/guix/commit/gnu/services/dns.scm?id=8490a8346b5c8207f5798be55bea1de865b0bd42'>services: Add ddclient service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/dns.scm (ddclient-configuration, ddclient-service-type): New
variables.
(uglify-field-name, serialize-field, serialize-boolean, serialize-integer,
serialize-string, serialize-list, serialize-extra-options,
ddclient-activation, ddclient-shepherd-service,
generate-ddclient-documentation): New procedures.
* doc/guix.texi (DNS Services): Document it.
</span></span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2018-06-08 23:32:49 +0800'>2018-06-08</span></td><td><a href='/guix/commit/gnu/services/dns.scm?id=0d4c2d35aff1bb28e2c105b9d7efc8c2a12d4601'>services: dnsmasq-service-type: Add default configuration and description.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/dns.scm (dnsmasq-service-type)
[default-value, description]: New fields.
</span></span></td><td>宋文武</td></tr>
<tr><td><span title='2018-06-08 23:32:49 +0800'>2018-06-08</span></td><td><a href='/guix/commit/gnu/services/dns.scm?id=c061eb587cbb8590a5cd4793b56a01560af747a8'>services: dnsmasq: Use 'negative-cache?' instead of 'no-negcache?'.</a><span class='msg-avail'>...<span class='msg-tooltip'>The 'no-negcache?' option is mapped to the '--no-negcache' command-line
argument directly, but we're in the scheme world, where the general guideline
is to avoid double-negations in identifiers.

* gnu/services/dns.scm &lt;dnsmasq-configuration&gt;: Replace the 'no-negcache?'
field with 'negative-cache?'.
* doc/guix.texi (DNS Services)[Dnsmasq Service]: Adjust accordingly.
</span></span></td><td>宋文武</td></tr>
<tr><td><span title='2018-06-05 20:05:31 +0800'>2018-06-05</span></td><td><a href='/guix/commit/gnu/services/dns.scm?id=97f6e9133a03f37c79e60678dd5670a805cdf693'>services: Add dnsmasq-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/dns.scm (dnsmasq-service-type): New variable.
(&lt;dnsmasq-configuration&gt;): New record type.
(dnsmasq-shepherd-service): New procedure.
* doc/guix.texi (DNS Services): Document it.
</span></span></td><td>宋文武</td></tr>
<tr><td><span title='2017-06-21 19:29:57 +0200'>2017-06-21</span></td><td><a href='/guix/commit/gnu/services/dns.scm?id=f3853a259b9b0588f6ae4f32c5c56a77ab096e86'>gnu: services: use seconds instead of duration strings.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/dns.scm (zone-file, knot-policy-configuration): Use numbers
instead of duration strings.
(verify-knot-policy-configuration): Fix typo.
* doc/guix.texi (DNS Services): Update documentation.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2017-05-27 10:40:24 +0200'>2017-05-27</span></td><td><a href='/guix/commit/gnu/services/dns.scm?id=ba69e8f7ce21a81bdd5b99fdb1cc64492443e15c'>gnu: Add knot-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/dns.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (DNS Services): New subsubsection.
</span></span></td><td>Julien Lepiller</td></tr>