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;
ss='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>refs</a><a class='active' href='/guix/log/gnu/packages/telephony.scm'>log</a><a href='/guix/tree/gnu/packages/telephony.scm?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>tree</a><a href='/guix/commit/gnu/packages/telephony.scm?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>commit</a><a href='/guix/diff/gnu/packages/telephony.scm?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/telephony.scm'>
<input type='hidden' name='id' value='b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'/><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=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>root</a>/<a href='/guix/log/gnu?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>gnu</a>/<a href='/guix/log/gnu/packages?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>packages</a>/<a href='/guix/log/gnu/packages/telephony.scm?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb'>telephony.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/telephony.scm?id=b34852a4c3628c3daf4faa4370a3cddfbfdd17bb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-14 15:45:31 +0100'>2024-11-14</span></td><td><a href='/guix/commit/gnu/packages/telephony.scm?id=62b0d90cc7a14415fa89bc99325785faed8496a6'>gnu: mumble: Update to 1.5.634, fix aarch64 build.</a><span class='msg-avail'>...<span class='msg-tooltip'>[[PGP Signed Part:No public key for 3DECC105F5DD2382 created at 2024-10-28T20:22:22+0100 using RSA]]
TestPacketDataStream failed to pass for aarch64 under 1.4.287 as described in
&lt;https://github.com/mumble-voip/mumble/issues/3845&gt;.  The new release fixes
that.

The new version changes some bundled dependencies.  Some of them are only kept
during the build for the sake of generating the text shown for third-party
licenses under the "About" dialog.

* gnu/packages/telephony.scm (mumble): Update to 1.5.634.
[source]: Update 3rd party dirs kept during build.
[arguments]: Update build options for bundled dependencies.
[inputs]: Depend on OpenSSL 3 and N. Lohmann's JSON lib.
[license]: Update licenses for bundled dependencies.

Change-Id: I39498ffa143e4416b06a6aa1a31fd46cd0ba2e3b
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Ivan Vilata i Balaguer</td></tr>
<tr><td><span title='2024-10-15 18:40:09 +0200'>2024-10-15</span></td><td><a href='/guix/commit/gnu/packages/telephony.scm?id=d268c964af758d83135f82489846210fe7bd8491'>gnu: sipwitch: Fix build.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/telephony.scm (sipwitch): Fix build.
[origin]&lt;patches&gt;: Add sipwitch-fix-build-with-exosip5.patch here...
* gnu/packages/patches: ...here and...
* gnu/local.mk: ...here.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2024-10-15 18:40:09 +0200'>2024-10-15</span></td><td><a href='/guix/commit/gnu/packages/telephony.scm?id=d3a82bbad252dbc10edbc3bfaa09ae0135e745b7'>gnu: exosip: Update to 5.3.0. [security fixes]</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes CVE-2014-10375.

* gnu/packages/telephony.scm (exosip): Update to 5.3.0.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2024-10-15 18:40:09 +0200'>2024-10-15</span></td><td><a href='/guix/commit/gnu/packages/telephony.scm?id=6870c3a4d08a0414715a66eb7d2351753eb94992'>gnu: osip: Update to 5.3.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/telephony.scm (osip): Update to 5.3.1.
[origin]&lt;patches&gt;: Remove patch.
* gnu/packages/patches/osip-CVE-2017-7853.patch : Remove it.
* gnu/local.mk: Remove patch.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2024-05-29 21:15:39 -0400'>2024-05-29</span></td><td><a href='/guix/commit/gnu/packages/telephony.scm?id=d368c802840e1dd880975962ee0bd0ec560b6a95'>gnu: pjproject-jami: Update to 2.13.1-2.797f1a3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/telephony.scm (pjproject-jami): Update to 2.13.1-2.797f1a3.

Change-Id: I7a037ee040f5c8ae9b038eada4a33e89559b5332
</span></span></td><td>Maxim Cournoyer</td></tr>