Add some checks to prevent crashes.

diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index d19dba8c2c400f1f713afd71ccdd5742906b3952..7e8eb683f84c8ee7efc78fdfe5d8055a73465ddb 100644 (file)
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -557,6 +557,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
        guint taskid=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(callview),"taskid"));
        gboolean in_conf=linphone_call_params_local_conference_mode(linphone_call_get_current_params(call));    
 
+       if ((callview==NULL) || (status==NULL)) return;
        if (error_msg==NULL)
                gtk_label_set_markup(GTK_LABEL(status),_("<b>Call ended.</b>"));
        else{

diff --git a/gtk/main.c b/gtk/main.c
index fa04a24e00759c63e56f0790030ee7f748fa8148..2955b3ecc81493aa57330b608772f3e1e63137dd 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -354,8 +354,10 @@ static void entry_unmapped(GtkWidget *entry){
 }
 
 GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name){
-       GtkBuilder *builder=(GtkBuilder*)g_object_get_data(G_OBJECT(window),"builder");
+       GtkBuilder *builder;
        GObject *w;
+       if (window==NULL) return NULL;
+       builder=(GtkBuilder*)g_object_get_data(G_OBJECT(window),"builder");
        if (builder==NULL){
                g_error("Fail to retrieve builder from window !");
                return NULL;