BGO#650286: Ensure valid UTF-8 from ATK

When we receive strings from atk, we should ensure that they are valid UTF-8
before sending them over D-Bus, since bad UTF-8 will cause dbus-daemon to
kill the connection.

1 files changed, 7 insertions, 0 deletions

diff --git a/droute/droute-variant.c b/droute/droute-variant.c
index d4b5ca6..bd5ef36 100644
--- a/droute/droute-variant.c
+++ b/droute/droute-variant.c
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "glib.h"
 
 #include "droute-variant.h"
 
@@ -64,6 +65,12 @@ droute_return_v_string (DBusMessageIter *iter, const char *val)
 
     if (!val)
       val = "";
+    if (!g_utf8_validate (val, -1, NULL))
+      {
+        g_warning ("droute: Received bad UTF-8 string");
+        val = "";
+      }
+
     if (!dbus_message_iter_open_container
         (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_STRING_AS_STRING, &sub))
       {