Fix potential crash by unsafe gst pipeline and improve unicode character handling

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ui/new_contact.c b/src/ui/new_contact.c
index 6579125..562219e 100644
--- a/src/ui/new_contact.c
+++ b/src/ui/new_contact.c
@@ -176,6 +176,9 @@ _setup_gst_pipeline(UI_NEW_CONTACT_Handle *handle)
       NULL
   );
 
+  if (!(handle->pipeline))
+    return;
+
   handle->source = gst_bin_get_by_name(
       GST_BIN(handle->pipeline), "source"
   );
@@ -190,6 +193,9 @@ _setup_gst_pipeline(UI_NEW_CONTACT_Handle *handle)
 
   GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(handle->pipeline));
 
+  if (!bus)
+    return;
+
   gst_bus_add_signal_watch(bus);
 
   g_signal_connect(
diff --git a/src/ui/picker.c b/src/ui/picker.c
index bdaa713..09ccf09 100644
--- a/src/ui/picker.c
+++ b/src/ui/picker.c
@@ -51,10 +51,14 @@ _add_emoji_buttons(GtkFlowBox *flow_box,
     GString *string = g_string_new("");
     g_string_append_unichar(string, (gunichar) characters[i]);
 
+    gchar *_text = g_locale_to_utf8(string->str, string->len, NULL, NULL, NULL);
+
     GtkButton *emoji_button = GTK_BUTTON(
       gtk_button_new_with_label(string->str)
     );
 
+    g_free(_text);
+
     gtk_button_set_relief(emoji_button, GTK_RELIEF_NONE);
 
     g_signal_connect(