Fix:Core:Fix coverity bug #4, Variable gui tracked as NULL was dereferenced.
authorhorwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Tue, 16 Jun 2009 09:20:08 +0000 (09:20 +0000)
committerhorwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Tue, 16 Jun 2009 09:20:08 +0000 (09:20 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@2321 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/gui/gtk/datawindow.c

index 3e9920e..75f43a8 100644 (file)
@@ -186,6 +186,8 @@ gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click,
 {
        struct datawindow_priv *win;
 
+       if (!gui)
+               return NULL;
        *meth=gui_gtk_datawindow_meth;
        win=g_new0(struct datawindow_priv, 1);
        win->window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -201,8 +203,7 @@ gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click,
        win->treeview=NULL;
        win->click=click;
        win->close=close;
-       if (gui)
-               gtk_window_set_transient_for(GTK_WINDOW((GtkWidget *)(win->window)), GTK_WINDOW(gui->win));
+       gtk_window_set_transient_for(GTK_WINDOW((GtkWidget *)(win->window)), GTK_WINDOW(gui->win));
        g_signal_connect(G_OBJECT(win->window), "delete-event", G_CALLBACK(gui_gtk_datawindow_delete), win);
        gtk_widget_show_all(win->window);