From f6e02a9cc4c2d91dc64818c0859d3938e5fb0b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 6 Jul 2015 13:34:23 +0200 Subject: [PATCH] Fix Gtk assert The first parameter of g_utf8_casefold must not be NULL --- gtk/main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gtk/main.c b/gtk/main.c index 6d65c9c62..eab4acccd 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -608,18 +608,14 @@ static gboolean linphone_gtk_iterate(LinphoneCore *lc){ static gboolean uribar_completion_matchfunc(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer user_data){ char* address = NULL; gboolean ret = FALSE; - gchar *tmp= NULL; gtk_tree_model_get(gtk_entry_completion_get_model(completion),iter,0,&address,-1); - tmp = g_utf8_casefold(address,-1); - if (tmp){ - if (strstr(tmp,key)) - ret=TRUE; + if(address) { + gchar *tmp = g_utf8_casefold(address,-1); + if (strstr(tmp,key)) ret=TRUE; g_free(tmp); - } - - if( address) g_free(address); + } return ret; }