luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'implicit_conversion' into 'main'

Browse Source 
g_string_append_len_inline: fix implicit conversion changes signedness

Closes #2919

See merge request GNOME/glib!3274
This commit is contained in:
Philip Withnall 2023-02-16 11:19:38 +00:00
commit 39eea23825
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gstring.h
View File

@ -207,6 +207,8 @@ g_string_append_len_inline (GString *gstring,
const char *val,
gssize len)
{
gsize len_unsigned;
if G_UNLIKELY (gstring == NULL)
return g_string_append_len (gstring, val, len);
@ -214,16 +216,18 @@ g_string_append_len_inline (GString *gstring,
return (len != 0) ? g_string_append_len (gstring, val, len) : gstring;
if (len < 0)
len = strlen (val);
len_unsigned = strlen (val);
else
len_unsigned = (gsize) len;
if (G_LIKELY (gstring->len + len < gstring->allocated_len))
if (G_LIKELY (gstring->len + len_unsigned < gstring->allocated_len))
{
char *end = gstring->str + gstring->len;
if (G_LIKELY (val + len <= end || val > end + len))
memcpy (end, val, len);
if (G_LIKELY (val + len_unsigned <= end || val > end + len_unsigned))
memcpy (end, val, len_unsigned);
else
memmove (end, val, len);
gstring->len += len;
memmove (end, val, len_unsigned);
gstring->len += len_unsigned;
gstring->str[gstring->len] = 0;
return gstring;
}