From e069c50467712e6d607822afd6b6c15c2c343dff Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 8 Feb 2021 10:34:50 +0000
Subject: [PATCH 2/5] giochannel: Don't store negative line_term_len in
 GIOChannel struct

Adding test coverage indicated that this was another bug in 0cc11f74.

Fixes: 0cc11f74 "giochannel: Forbid very long line terminator strings"
Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2323
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 5dc8b0014c03e7491d93b90275ab442e888a9628)
---
 glib/giochannel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 0d9d5f223..4c39b9dc0 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -903,7 +903,7 @@ g_io_channel_set_line_term (GIOChannel	*channel,
 
   g_free (channel->line_term);
   channel->line_term = line_term ? g_memdup2 (line_term, length_unsigned) : NULL;
-  channel->line_term_len = length;
+  channel->line_term_len = length_unsigned;
 }
 
 /**
-- 
2.30.1

'/guix/'>summary</a><a href='/guix/refs/?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>refs</a><a class='active' href='/guix/log/gnu/services/cups.scm'>log</a><a href='/guix/tree/gnu/services/cups.scm?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>tree</a><a href='/guix/commit/gnu/services/cups.scm?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>commit</a><a href='/guix/diff/gnu/services/cups.scm?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/cups.scm'>
<input type='hidden' name='id' value='237d4cf73c0a4b7b25653c01a6003e1db3da1716'/><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=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>root</a>/<a href='/guix/log/gnu?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>gnu</a>/<a href='/guix/log/gnu/services?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>services</a>/<a href='/guix/log/gnu/services/cups.scm?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716'>cups.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/cups.scm?id=237d4cf73c0a4b7b25653c01a6003e1db3da1716&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-08-31 03:24:41 +0200'>2019-08-31</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=5a097cdd5446587511dbee049ad706366c74e5ad'>services: cups: Rename ‘retry-this-job’ to ‘retry-current-job’.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-08-30 03:41:42 +0200'>2019-08-30</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=70186c24eee7603e1763143ba97ab6abea63f10c'>services: cups: Move SET-ENV to FILES-CONFIGURATION.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-08-30 03:41:42 +0200'>2019-08-30</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=ee0de9945438cce41ef20e37144f41a8d40cd1ab'>services: cups: Add BrowseDNSSDSubTypes directive.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-08-27 08:58:37 +0200'>2019-08-27</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=9e3ef6f3e37aa65f25cbe025106324144ed42b3d'>services: cups: Update SSL-OPTIONS docstring.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-08-27 08:49:14 +0200'>2019-08-27</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=f9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad'>services: cups: Complete SSL-OPTIONS.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-06-05 17:27:23 +0200'>2019-06-05</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=36273ebde20db42d864e315c954d84d2b4957070'>services: cups: Create /var/cache on activation.</a><span class='msg-avail'>...</span></td><td>Alex Griffin</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=59e80445882f8b0379e54916f89510c0deda6698'>Remove traces of "GuixSD".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-22 12:37:19 +0200'>2018-06-22</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=86cd3f97230fe8914cfbbf0df0b26ea2c9b9502d'>services: cups: Add description.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2017-04-16 00:48:08 +0200'>2017-04-16</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=3d3c56500843b5573ba6419db5e66075fb8ac8ef'>services: Add a default value to various service types.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-03-12 19:09:32 +0100'>2017-03-12</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=720cb10c15a4606fe0dc3511db4fef325f3d9dc6'>services: Move configuration functions that shouldn't be factorized.</a><span class='msg-avail'>...</span></td><td>Clément Lassieur</td></tr>
<tr><td><span title='2017-01-25 14:05:37 +0100'>2017-01-25</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=e57bd0bed86caac304e5f37c5653e6b13858c7c5'>services: Fix 'mkdir-p' in activation scripts.</a><span class='msg-avail'>...</span></td><td>Clément Lassieur</td></tr>
<tr><td><span title='2016-12-01 11:03:20 +0100'>2016-12-01</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=4ce8860df9c053e3e111f04adcbb636728954251'>services: cups: Follow symlinks when installing extensions.</a><span class='msg-avail'>...</span></td><td>Andy Patterson</td></tr>
<tr><td><span title='2016-11-26 19:46:01 +0100'>2016-11-26</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=5305ed20027a32ff1221cac6a131849852e807ba'>services: Factorize configuration abstraction.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2016-10-13 11:37:25 +0200'>2016-10-13</span></td><td><a href='/guix/commit/gnu/services/cups.scm?id=f2ec23d18e50eef3e4f574a3e6498d8964e4e1a3'>gnu: Add CUPS service.</a><span class='msg-avail'>...</span></td><td>Andy Wingo</td></tr>