diff options
| author | horwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-04-07 21:59:10 +0000 |
|---|---|---|
| committer | horwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-04-07 21:59:10 +0000 |
| commit | 62cfbd89d6ec465f0821c91ba20478744b8a4f29 (patch) | |
| tree | ff05ed8e500ecdf11bce538a6076bdee10c9ea22 /navit/gui/gtk/destination.c | |
| parent | 73248239bf5970e5a123b5b86061dbca73ca72a9 (diff) | |
| download | navit-62cfbd89d6ec465f0821c91ba20478744b8a4f29.tar.gz | |
Fix:GUI_GTK:fix segfault when postal code is missing|Thanks to Stressedpiper for the patch
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2190 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/gui/gtk/destination.c')
| -rw-r--r-- | navit/gui/gtk/destination.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c index f84107336..e7f95fe06 100644 --- 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 |