talons

commit 6110e7055f145549af317a4c9cf05f6e2c1b620e
parent b794c279c9d6d71e534b3a40126124572ea89610
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 31 Aug 2016 17:11:24 +0200

Fix a few Coverity issues

Diffstat:
M
src/editaddress.c
 | 
2
+-
M
src/etpan/imap-thread.c
 | 
7
++++++-
M
src/filtering.c
 | 
2
+-
M
src/gtk/gtkcmctree.c
 | 
2
+-
M
src/gtk/gtksctree.c
 | 
2
+-
M
src/mbox.c
 | 
4
----
M
src/messageview.c
 | 
2
--
M
src/mh.c
 | 
4
++--

8 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -1559,7 +1559,7 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
 	listEMail = NULL;
 	listAttrib = NULL;
 
-	if( ! cancelled ) {
+	if(!cancelled && current_person != NULL) {
 		/* Set current_person stuff */		
 
 		gchar *name;
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
@@ -2869,7 +2869,12 @@ imap_get_envelopes_list(mailimap * imap, struct mailimap_set * set,
 		r = imap_add_envelope_fetch_att(fetch_type);
 	else
 		r = imap_add_header_fetch_att(fetch_type);
-	
+
+	if (r != MAILIMAP_NO_ERROR) {
+		debug_print("add fetch attr: %d\n", r);
+		return r;
+	}
+
 	mailstream_logger = imap_logger_fetch;
 	
 	r = mailimap_uid_fetch(imap, set, fetch_type, &fetch_result);
diff --git a/src/filtering.c b/src/filtering.c
@@ -237,7 +237,7 @@ void filtering_move_and_copy_msgs(GSList *msgs)
 		} else {
 			debug_print("%d messages to %s in %s\n", found,
 				cur_op==IS_COPY ? "copy":(cur_op==IS_DELE ?"delete":"move"), 
-				last_item?(last_item->name ? last_item->name:"(noname)"):"nowhere");
+				last_item->name ? last_item->name:"(noname)");
 		}
 		for (cur = batch; cur; cur = cur->next) {
 			MsgInfo *info = (MsgInfo *)cur->data;
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -1556,7 +1556,7 @@ gtk_cmctree_link (GtkCMCTree     *ctree,
 	  
 	  list_end->next = work->next;
 	  if (work->next)
-	    list = work->next->prev = list_end;
+	    work->next->prev = list_end;
 	  work->next = (GList *)node;
 	  list = (GList *)node;
 	  list->prev = work;
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
@@ -1451,7 +1451,7 @@ gtk_sctree_link (GtkCMCTree     *ctree,
 
 			list_end->next = work->next;
 			if (work->next)
-				list = work->next->prev = list_end;
+				work->next->prev = list_end;
 			work->next = (GList *)node;
 			list = (GList *)node;
 			list->prev = work;
diff --git a/src/mbox.c b/src/mbox.c
@@ -495,10 +495,6 @@ gint copy_mbox(gint srcfd, const gchar *dest)
 	}
 
 	while ((n_read = read(srcfd, buf, sizeof(buf))) > 0) {
-		if (n_read == -1 && errno != 0) {
-			save_errno = errno;
-			break;
-		}
 		if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
 			g_warning("writing to %s failed.", dest);
 			fclose(dest_fp);
diff --git a/src/messageview.c b/src/messageview.c
@@ -2642,9 +2642,7 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
 static void goto_folder_cb(GtkAction *action, gpointer data)
 {
 	MessageView *messageview = (MessageView *)data;
-	messageview->updating = TRUE;
 	FolderItem *to_folder;
-	messageview->updating = FALSE;
 
 	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE);
 
diff --git a/src/mh.c b/src/mh.c
@@ -226,7 +226,7 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
 	if ((s.st_mtime > item->mtime) &&
 		(s.st_mtime - 3600 != item->mtime)) {
 		debug_print("MH scan required, folder updated: %s (%ld > %ld)\n",
-			    path?path:"(null)",
+			    path,
 			    (long int) s.st_mtime,
 			    (long int) item->mtime);
 		g_free(path);
@@ -234,7 +234,7 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
 	}
 
 	debug_print("MH scan not required: %s (%ld <= %ld)\n",
-		    path?path:"(null)",
+		    path,
 		    (long int) s.st_mtime,
 		    (long int) item->mtime);
 	g_free(path);