From b6747e6a9dd09628bff15fb9475aef582f9737be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 28 Nov 2016 12:28:28 +0200 Subject: [PATCH] message: Ensure that the "debug" field of error/warning/info messages is valid UTF-8 The caller might pass arbitrary data here that caused the error, and trying to set invalid UTF-8 in a GstStructure causes it to be not set at all. Later when trying to parse it, the field will not exist and the return value will point to invalid memory. Prevent this by storing NULL instead. Also print a g_warning(), the caller should never ever do this to begin with. --- gst/gstmessage.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gst/gstmessage.c b/gst/gstmessage.c index 764dfd88a3..a1d0d2657b 100644 --- a/gst/gstmessage.c +++ b/gst/gstmessage.c @@ -415,6 +415,12 @@ gst_message_new_error_with_details (GstObject * src, GError * error, GstMessage *message; GstStructure *structure; + if (!g_utf8_validate (debug, -1, NULL)) { + debug = NULL; + g_warning ("Trying to set debug field of error message, but " + "string is not valid UTF-8. Please file a bug."); + } + structure = gst_structure_new_id (GST_QUARK (MESSAGE_ERROR), GST_QUARK (GERROR), G_TYPE_ERROR, error, GST_QUARK (DEBUG), G_TYPE_STRING, debug, NULL); @@ -501,6 +507,12 @@ gst_message_new_warning_with_details (GstObject * src, GError * error, GstMessage *message; GstStructure *structure; + if (!g_utf8_validate (debug, -1, NULL)) { + debug = NULL; + g_warning ("Trying to set debug field of warning message, but " + "string is not valid UTF-8. Please file a bug."); + } + structure = gst_structure_new_id (GST_QUARK (MESSAGE_WARNING), GST_QUARK (GERROR), G_TYPE_ERROR, error, GST_QUARK (DEBUG), G_TYPE_STRING, debug, NULL); @@ -585,6 +597,12 @@ gst_message_new_info_with_details (GstObject * src, GError * error, GstMessage *message; GstStructure *structure; + if (!g_utf8_validate (debug, -1, NULL)) { + debug = NULL; + g_warning ("Trying to set debug field of info message, but " + "string is not valid UTF-8. Please file a bug."); + } + structure = gst_structure_new_id (GST_QUARK (MESSAGE_INFO), GST_QUARK (GERROR), G_TYPE_ERROR, error, GST_QUARK (DEBUG), G_TYPE_STRING, debug, NULL);