Merge branch 'textbuf-serialize-fix-format-string' into 'gtk-3-24'

GtkTextBufferSerialize: Check and fix format string arguments

See merge request GNOME/gtk!779
This commit is contained in:
Matthias Clasen 2019-04-27 13:17:20 +00:00
commit 09bdd4531a

View File

@ -703,6 +703,14 @@ typedef struct
gboolean parsed_tags;
} ParseInfo;
static void
set_error (GError **err,
GMarkupParseContext *context,
int error_domain,
int error_code,
const char *format,
...) G_GNUC_PRINTF(5, 6);
static void
set_error (GError **err,
GMarkupParseContext *context,
@ -833,7 +841,8 @@ check_id_or_name (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
_("<%s> element has invalid ID \"%s\""), attribute_values[i]);
_("<%s> element has invalid ID \"%s\""),
element_name, attribute_values[i]);
return FALSE;
}
}