luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

giochannel: Fix incorrect use of a signed gsize when unsigned will do

Browse Source 
The value of `wrote_bytes` will never be negative, so there’s no need to
store it in a signed type.

Add a couple of assertions to validate that it never decreases and hence
can never go negative.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-11-22 14:15:11 +00:00
parent b2dd6d9053
commit a03160adf3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib/giochannel.c
View File

@ -2205,7 +2205,7 @@ g_io_channel_write_chars (GIOChannel *channel,
{ {
gsize count_unsigned; gsize count_unsigned;
GIOStatus status; GIOStatus status;
gssize wrote_bytes = 0; gsize wrote_bytes = 0;
g_return_val_if_fail (channel != NULL, G_IO_STATUS_ERROR); g_return_val_if_fail (channel != NULL, G_IO_STATUS_ERROR);
g_return_val_if_fail (buf != NULL || count == 0, G_IO_STATUS_ERROR); g_return_val_if_fail (buf != NULL || count == 0, G_IO_STATUS_ERROR);
@ -2313,7 +2313,11 @@ g_io_channel_write_chars (GIOChannel *channel,
if (!channel->encoding) if (!channel->encoding)
{ {
gssize write_this = MIN (space_in_buf, count_unsigned - wrote_bytes); gsize write_this = MIN (space_in_buf, count_unsigned - wrote_bytes);
/* g_string_append_len() takes a gssize, so don’t overflow it*/
if (write_this > G_MAXSSIZE)
write_this = G_MAXSSIZE;
g_string_append_len (channel->write_buf, buf, write_this); g_string_append_len (channel->write_buf, buf, write_this);
buf += write_this; buf += write_this;
@ -2476,7 +2480,10 @@ reconvert:
g_warning ("Illegal sequence due to partial character " g_warning ("Illegal sequence due to partial character "
"at the end of a previous write."); "at the end of a previous write.");
else else
{
g_assert (from_buf_len >= left_len + from_buf_old_len);
wrote_bytes += from_buf_len - left_len - from_buf_old_len; wrote_bytes += from_buf_len - left_len - from_buf_old_len;
}
if (bytes_written) if (bytes_written)
*bytes_written = wrote_bytes; *bytes_written = wrote_bytes;
channel->partial_write_buf[0] = '\0'; channel->partial_write_buf[0] = '\0';