From ecdf91400e9a538695a0895b95ad7e8abcdf1749 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 4 Feb 2021 14:09:40 +0000 Subject: [PATCH 11/11] giochannel: Forbid very long line terminator strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The public API `GIOChannel.line_term_len` is only a `guint`. Ensure that nul-terminated strings passed to `g_io_channel_set_line_term()` can’t exceed that length. Use `g_memdup2()` to avoid a warning (`g_memdup()` is due to be deprecated), but not to avoid a bug, since it’s also limited to `G_MAXUINT`. Signed-off-by: Philip Withnall Helps: #2319 --- glib/giochannel.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/glib/giochannel.c b/glib/giochannel.c index 15927c391..66c6591f0 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -884,16 +884,25 @@ g_io_channel_set_line_term (GIOChannel *channel, const gchar *line_term, gint length) { + guint length_unsigned; + g_return_if_fail (channel != NULL); g_return_if_fail (line_term == NULL || length != 0); /* Disallow "" */ if (line_term == NULL) - length = 0; - else if (length < 0) - length = strlen (line_term); + length_unsigned = 0; + else if (length >= 0) + length_unsigned = (guint) length; + else + { + /* FIXME: We’re constrained by line_term_len being a guint here */ + gsize length_size = strlen (line_term); + g_return_if_fail (length_size > G_MAXUINT); + length_unsigned = (guint) length_size; + } g_free (channel->line_term); - channel->line_term = line_term ? g_memdup2 (line_term, length) : NULL; + channel->line_term = line_term ? g_memdup2 (line_term, length_unsigned) : NULL; channel->line_term_len = length; } -- 2.30.1 e='q' value=''/>
path: root/etc/completion/bash
AgeCommit message (Expand)Author
2020-12-04bash completion: Complete file names after '-f' and '-l'....Ludovic Courtès
2020-09-24bash completion: Adjust to new 'guix help' output....Ludovic Courtès
2020-09-21bash completion: Complete file names after 'guix package -p'....Fulbert
2020-09-10bash completion: Restore completion for 'guix system', etc....Ludovic Courtès
2020-06-27bash completion: Complete 'guix environment' properly....Ludovic Courtès
2020-06-04bash completion: Complete sub-commands after 'guix time-machine'....Ludovic Courtès
2020-06-04bash completion: Complete file names after '-p' and '-C'....Ludovic Courtès
2020-02-14guix build: Add '--manifest' option....Marius Bakke
2019-04-29guix package: Add 'install', 'remove', and 'upgrade' aliases....Ludovic Courtès
2018-11-06bash completion: Restore completion of available packages for 'guix build'....Ludovic Courtès
2018-07-03bash completion: Complete files names after 'guix weather -m'....Oleg Pykhalov
2018-07-03bash completion: Complete files names after 'guix build -L'....Oleg Pykhalov
2018-06-16Add guix-daemon Bash completion file....Oleg Pykhalov
2018-02-17bash completion: Complete files names after 'guix package -m'....Oleg Pykhalov