commit 0731de037ff5aea321071bdecd2c8c4812657728
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Tue May 17 17:47:16 2016 -0400
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed May 18 14:19:50 2016 -0500
tree 9d70b8cd2f5d30553f6fb58826a7b3e6bb91b58c
parent 1cf27113f883bb45e1a24fb202a0df82053a7c93

escape pango markup formatted strings

To make sure string contents don't get interpreted as markup.

Change-Id: I0463014b43bd327865983d86b48d966c34cb7cbd
Tuleap: #705

src/ringmainwindow.cpp

diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp
index 75e1617..3ba41af 100644
--- a/src/ringmainwindow.cpp
+++ b/src/ringmainwindow.cpp
@@ -696,18 +696,16 @@
                            GtkTreeIter *iter,
                            G_GNUC_UNUSED gpointer user_data)
 {
+    gchar *text = nullptr;
     QModelIndex idx = get_qidx_from_filter_model(GTK_TREE_MODEL_FILTER(model), iter);
     if (idx.isValid()) {
         QVariant name = idx.sibling(idx.row(), 1).data(Qt::DisplayRole);
-        gchar *text = g_strdup_printf("<span weight=\"bold\">%s</span>",
-                                      name.value<QString>().toUtf8().constData());
-
-        g_object_set(G_OBJECT(cell), "markup", text, NULL);
-        g_free(text);
-        return;
+        text = g_markup_printf_escaped("<span weight=\"bold\">%s</span>",
+                                       name.value<QString>().toUtf8().constData());
     }
 
-    g_object_set(G_OBJECT(cell), "markup", NULL, NULL);
+    g_object_set(G_OBJECT(cell), "markup", text, NULL);
+    g_free(text);
 }
 
 static void
@@ -717,17 +715,15 @@
                              GtkTreeIter *iter,
                              G_GNUC_UNUSED gpointer user_data)
 {
+    gchar *text = nullptr;
     QModelIndex idx = get_qidx_from_filter_model(GTK_TREE_MODEL_FILTER(model), iter);
     if (idx.isValid()) {
         QVariant uri = idx.data(Qt::DisplayRole);
-        gchar *text = g_strdup_printf("%s", uri.value<QString>().toUtf8().constData());
-
-        g_object_set(G_OBJECT(cell), "markup", text, NULL);
-        g_free(text);
-        return;
+        text = g_markup_escape_text(uri.value<QString>().toUtf8().constData(), -1);
     }
 
-    g_object_set(G_OBJECT(cell), "markup", NULL, NULL);
+    g_object_set(G_OBJECT(cell), "markup", text, NULL);
+    g_free(text);
 }
 
 static void
@@ -737,18 +733,16 @@
                               GtkTreeIter *iter,
                               G_GNUC_UNUSED gpointer user_data)
 {
+    gchar *text = nullptr;
     QModelIndex idx = get_qidx_from_filter_model(GTK_TREE_MODEL_FILTER(model), iter);
     if (idx.isValid()) {
         QVariant alias = idx.sibling(idx.row(), 2).data(Qt::DisplayRole);
-        gchar *text = g_strdup_printf("<span color=\"gray\">%s</span>",
-                                      alias.value<QString>().toUtf8().constData());
-
-        g_object_set(G_OBJECT(cell), "markup", text, NULL);
-        g_free(text);
-        return;
+        text = g_markup_printf_escaped("<span color=\"gray\">%s</span>",
+                                       alias.value<QString>().toUtf8().constData());
     }
 
-    g_object_set(G_OBJECT(cell), "markup", NULL, NULL);
+    g_object_set(G_OBJECT(cell), "markup", text, NULL);
+    g_free(text);
 }
 
 static gboolean