From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 31 Jul 2012 15:10:53 +0000 (+0200)
Subject: Add some checks to prevent crashes.
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=53d44ea8eea3d08f8e644887736db9bd21f9b35a

Add some checks to prevent crashes.
---

diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index d19dba8c..7e8eb683 100644
--- 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 fa04a24e..2955b3ec 100644
--- 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;