Fix bug report

diff --git a/console/linphonec.c b/console/linphonec.c
index fca5a9b86987565c02c4e5914f4a524e13d140d9..60c3c2af11c48256e6af0ccfaa290d702e683b05 100644 (file)
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -1400,6 +1400,7 @@ copy_file(const char *from, const char *to)
                snprintf(message, 255, "Can't open %s for writing: %s\n",
                        to, strerror(errno));
                fprintf(stderr, "%s", message);
+               fclose(in);
                return 0;
        }
 
@@ -1408,6 +1409,8 @@ copy_file(const char *from, const char *to)
        {
                if ( ! fwrite(buf, 1, n, out) )
                {
+                       fclose(in);
+                       fclose(out);
                        return 0;
                }
        }

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 8ba642b6877aecd0216177f057073b2bb435a248..deed140c7a48c8a2c410c45719d93845ec2f5c5c 100644 (file)
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -204,13 +204,13 @@ void linphone_create_table(sqlite3* db){
 \r
 void linphone_core_message_storage_init(LinphoneCore *lc){\r
        int ret;\r
-       char *errmsg=NULL;\r
+       const char *errmsg;\r
        sqlite3 *db;\r
        ret=sqlite3_open(lc->chat_db_file,&db);\r
        if(ret != SQLITE_OK) {\r
+               errmsg=sqlite3_errmsg(db);\r
                printf("Error in the opening: %s.\n", errmsg);\r
                sqlite3_close(db);\r
-               sqlite3_free(errmsg);\r
        }\r
        linphone_create_table(db);\r
        lc->db=db;\r

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 0c1b12445a963151d98aa1be378e28cfd60e5b10..284773c9d503264010ea14f8e9cedbaaa9dea505 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -1464,6 +1464,7 @@ static bool_t call_failure(Sal *sal, eXosip_event_t *ev){
                case 480:\r
                        error=SalErrorFailure;\r
                        sr=SalReasonTemporarilyUnavailable;\r
+               break;\r
                case 486:\r
                        error=SalErrorFailure;\r
                        sr=SalReasonBusy;\r

diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c
index debd8550f63e35fb288286946d6e17616ce4041a..54865aab6a19ef69d0333d33d3dfaba28dcb20c1 100644 (file)
--- a/coreapi/sal_eXosip2_sdp.c
+++ b/coreapi/sal_eXosip2_sdp.c
@@ -547,7 +547,7 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
                        for (k=0;valid_count < SAL_CRYPTO_ALGO_MAX && (attr=sdp_message_attribute_get(msg,i,k))!=NULL;k++){
                                char tmp[256], tmp2[256];
                                if (keywordcmp("crypto",attr->a_att_field)==0 && attr->a_att_value!=NULL){
-                                       int nb = sscanf(attr->a_att_value, "%d %256s inline:%256s",
+                                       int nb = sscanf(attr->a_att_value, "%d %255s inline:%255s",
                                                &stream->crypto[valid_count].tag,
                                                tmp,
                                                tmp2);

diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 5e13f2602e340d9c90eaedad7990e206438cbe14..da954a45b84c3e19c12de2eee419dcbc273880ac 100644 (file)
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -741,11 +741,12 @@ static gboolean in_call_view_terminated(LinphoneCall *call){
 
 void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_msg){
        GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
+       if(callview==NULL) return;
        GtkWidget *status=linphone_gtk_get_widget(callview,"in_call_status");
        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 (status==NULL) return;
        if (error_msg==NULL)
                gtk_label_set_markup(GTK_LABEL(status),_("<b>Call ended.</b>"));
        else{