Merge branch 'fix-inline-warnings' into 'main'

gstring: Avoid warnings from inline functions

See merge request GNOME/glib!3249
This commit is contained in:
Philip Withnall 2023-02-03 07:57:40 +00:00
commit b3b459107a

View File

@ -187,7 +187,8 @@ static inline GString*
g_string_append_c_inline (GString *gstring, g_string_append_c_inline (GString *gstring,
gchar c) gchar c)
{ {
if (G_LIKELY (gstring->len + 1 < gstring->allocated_len)) if (G_LIKELY (gstring != NULL &&
gstring->len + 1 < gstring->allocated_len))
{ {
gstring->str[gstring->len++] = c; gstring->str[gstring->len++] = c;
gstring->str[gstring->len] = 0; gstring->str[gstring->len] = 0;