Fix:GUI_GTK:fix segfault when postal code is missing|Thanks to Stressedpiper for...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2190 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c
index f841073..e7f95fe 100644 (file)
--- a/navit/gui/gtk/destination.c
+++ b/navit/gui/gtk/destination.c
@@ -70,10 +70,19 @@ static void button_map(GtkWidget *widget, struct search_param *search)
 static char *description(struct search_param *search, GtkTreeIter *iter)
 {
        char *desc,*car,*postal,*town,*street;
+       char empty='\0';
+               
        gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 0, &car, -1);
        gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 1, &postal, -1);
        gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 2, &town, -1);
        gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 4, &street, -1);
+       
+       /* protect against nulls */
+    if (car==0) car=∅
+    if (postal==0) postal=∅    
+    if (town==0) town=∅
+    if (street==0) street=∅
+       
        if (search->attr.type == attr_town_name)
                desc=g_strdup_printf("%s-%s %s", car, postal, town);
        else