luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mcatanzaro/gstring-overflow' into 'main'

Browse Source 
gstring: carefully handle gssize parameters

See merge request GNOME/glib!4588
This commit is contained in:
Michael Catanzaro
2025-04-10 18:39:35 +00:00
parent 551cdd98dc cc647f9e46
commit 44ac298dca
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
glib/gstring.c
View File

@@ -480,8 +480,9 @@ g_string_insert_len (GString *string,
return string;
if (len < 0)
len = strlen (val);
len_unsigned = len;
len_unsigned = strlen (val);
else
len_unsigned = len;
if (pos < 0)
pos_unsigned = string->len;
@@ -778,10 +779,12 @@ g_string_insert_c (GString *string,
g_string_maybe_expand (string, 1);
if (pos < 0)
pos = string->len;
pos_unsigned = string->len;
else
g_return_val_if_fail ((gsize) pos <= string->len, string);
pos_unsigned = pos;
{
pos_unsigned = pos;
g_return_val_if_fail (pos_unsigned <= string->len, string);
}
/* If not just an append, move the old stuff */
if (pos_unsigned < string->len)
@@ -814,6 +817,7 @@ g_string_insert_unichar (GString *string,
gssize pos,
gunichar wc)
{
gsize pos_unsigned;
gint charlen, first, i;
gchar *dest;
@@ -855,15 +859,18 @@ g_string_insert_unichar (GString *string,
g_string_maybe_expand (string, charlen);
if (pos < 0)
pos = string->len;
pos_unsigned = string->len;
else
g_return_val_if_fail ((gsize) pos <= string->len, string);
{
pos_unsigned = pos;
g_return_val_if_fail (pos_unsigned <= string->len, string);
}
/* If not just an append, move the old stuff */
if ((gsize) pos < string->len)
memmove (string->str + pos + charlen, string->str + pos, string->len - pos);
if (pos_unsigned < string->len)
memmove (string->str + pos_unsigned + charlen, string->str + pos_unsigned, string->len - pos_unsigned);
dest = string->str + pos;
dest = string->str + pos_unsigned;
/* Code copied from g_unichar_to_utf() */
for (i = charlen - 1; i > 0; --i)
{
@@ -921,6 +928,7 @@ g_string_overwrite_len (GString *string,
const gchar *val,
gssize len)
{
gssize len_unsigned;
gsize end;
g_return_val_if_fail (string != NULL, NULL);
@@ -932,14 +940,16 @@ g_string_overwrite_len (GString *string,
g_return_val_if_fail (pos <= string->len, string);
if (len < 0)
len = strlen (val);
len_unsigned = strlen (val);
else
len_unsigned = len;
end = pos + len;
end = pos + len_unsigned;
if (end > string->len)
g_string_maybe_expand (string, end - string->len);
memcpy (string->str + pos, val, len);
memcpy (string->str + pos, val, len_unsigned);
if (end > string->len)
{