[Commits] [SCM] claws branch, master, updated. 3.17.0-74-ge0db602

[Colin]

The branch, master has been updated
       via  e0db6026a22b084f296c004f48ab86d3ab5a3e8e (commit)
       via  2a91260a6c7f35cb9e22b1e5695606c3d7295269 (commit)
       via  e31fed7786e0c1343cff5577fe762d444c34c84d (commit)
       via  763117cd9ab6536fc25c45cc7be49497d085085a (commit)
       via  5a109f1a419f3f216bcee5211e8af6ec6470f26a (commit)
      from  0687f039da4840e02ec1afd32649bc763e1b1118 (commit)

Summary of changes:
 src/folderview.c                             |   30 ++++++++++++--------------
 src/plugins/mailmbox/mailimf.c               |    3 +--
 src/plugins/notification/notification_core.c |    8 +++----
 3 files changed, 19 insertions(+), 22 deletions(-)


- Log -----------------------------------------------------------------
commit e0db6026a22b084f296c004f48ab86d3ab5a3e8e
Merge: 2a91260 0687f03
Author: Colin Leroy <colin at colino.net>
Date:   Tue Oct 2 16:34:17 2018 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 2a91260a6c7f35cb9e22b1e5695606c3d7295269
Author: Colin Leroy <colin at colino.net>
Date:   Tue Oct 2 16:27:41 2018 +0200

    Fix Coverity #1372351

diff --git a/src/folderview.c b/src/folderview.c
index 246ab3c..03a63c7 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -3185,23 +3185,21 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 			      src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) {
 				return;
 			}
-			if (item && src_item) {
-				switch (gdk_drag_context_get_selected_action(drag_context)) {
-				case GDK_ACTION_COPY:
+
+			switch (gdk_drag_context_get_selected_action(drag_context)) {
+			case GDK_ACTION_COPY:
+				summary_copy_selected_to(folderview->summaryview, item);
+				gtk_drag_finish(drag_context, TRUE, FALSE, time);
+				break;
+			case GDK_ACTION_MOVE:
+			case GDK_ACTION_DEFAULT:
+			default:
+				if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL)
 					summary_copy_selected_to(folderview->summaryview, item);
-					gtk_drag_finish(drag_context, TRUE, FALSE, time);
-					break;
-				case GDK_ACTION_MOVE:
-				case GDK_ACTION_DEFAULT:
-				default:
-					if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL)
-				        	summary_copy_selected_to(folderview->summaryview, item);
-					else
-						summary_move_selected_to(folderview->summaryview, item);
-					gtk_drag_finish(drag_context, TRUE, TRUE, time);
-				}
-			} else
-				gtk_drag_finish(drag_context, FALSE, FALSE, time);
+				else
+					summary_move_selected_to(folderview->summaryview, item);
+				gtk_drag_finish(drag_context, TRUE, TRUE, time);
+			}
 		} else {
 			/* comes from folderview */
 			char *source;

commit e31fed7786e0c1343cff5577fe762d444c34c84d
Author: Colin Leroy <colin at colino.net>
Date:   Tue Oct 2 16:27:27 2018 +0200

    Fix build warning

diff --git a/src/plugins/mailmbox/mailimf.c b/src/plugins/mailmbox/mailimf.c
index fd44122..af49ca4 100644
--- a/src/plugins/mailmbox/mailimf.c
+++ b/src/plugins/mailmbox/mailimf.c
@@ -4521,7 +4521,6 @@ static int mailimf_field_parse(const char * message, size_t length,
     mailimf_keywords_free(keywords);
   if (optional_field != NULL)
     mailimf_optional_field_free(optional_field);
- err:
   return res;
 }
 

commit 763117cd9ab6536fc25c45cc7be49497d085085a
Author: Colin Leroy <colin at colino.net>
Date:   Tue Oct 2 16:21:16 2018 +0200

    Fix Coverity #1220388

diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c
index c585b2c..d7e9820 100644
--- a/src/plugins/notification/notification_core.c
+++ b/src/plugins/notification/notification_core.c
@@ -656,22 +656,22 @@ gchar* notification_libnotify_sanitize_str(gchar *in)
   out = 0;
   while(*in) {
     if(*in == '<') {
-      if(out+4 > STR_MAX_LEN+1) break;
+      if(out+4 > STR_MAX_LEN) break;
       memcpy(&(tmp_str[out]),"<",4);
       in++; out += 4;
     }
     else if(*in == '>') {
-      if(out+4 > STR_MAX_LEN+1) break;
+      if(out+4 > STR_MAX_LEN) break;
       memcpy(&(tmp_str[out]),">",4);
       in++; out += 4;
     }
     else if(*in == '&') {
-      if(out+5 > STR_MAX_LEN+1) break;
+      if(out+5 > STR_MAX_LEN) break;
       memcpy(&(tmp_str[out]),"&",5);
       in++; out += 5;
     }
     else {
-      if(out+1 > STR_MAX_LEN+1) break;
+      if(out+1 > STR_MAX_LEN) break;
       tmp_str[out++] = *in++;
     }
   }

commit 5a109f1a419f3f216bcee5211e8af6ec6470f26a
Author: Colin Leroy <colin at colino.net>
Date:   Tue Oct 2 16:16:57 2018 +0200

    Fix Coverity #1220444

diff --git a/src/plugins/mailmbox/mailimf.c b/src/plugins/mailmbox/mailimf.c
index d664050..fd44122 100644
--- a/src/plugins/mailmbox/mailimf.c
+++ b/src/plugins/mailmbox/mailimf.c
@@ -4455,7 +4455,7 @@ static int mailimf_field_parse(const char * message, size_t length,
         &optional_field);
     if (r != MAILIMF_NO_ERROR) {
       res = r;
-      goto err;
+      goto free_fields;
     }
 
     type = MAILIMF_FIELD_OPTIONAL_FIELD;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail