[Commits] [SCM] claws branch, master, updated. 3.10.1-138-g71e3960

[ticho at claws-mail.org]

The branch, master has been updated
       via  71e39607218b5801da5c30084633f821492b7c33 (commit)
       via  bf1a050d4e8f01b50086ac4a15e4537d70d452b4 (commit)
      from  7229dd2c728a99266b47b7a3e154ef4744cb9c43 (commit)

Summary of changes:
 src/common/utils.c |    1 +
 src/summaryview.c  |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 71e39607218b5801da5c30084633f821492b7c33
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Aug 1 10:28:52 2014 +0200

    Add check for a NULL parameter to extract_address(), to prevent possible null pointer dereference.

diff --git a/src/common/utils.c b/src/common/utils.c
index 8382176..9b9b1f8 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -926,6 +926,7 @@ gchar *strchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
 
 void extract_address(gchar *str)
 {
+	cm_return_if_fail(str != NULL);
 	eliminate_address_comment(str);
 	if (strchr_with_skip_quote(str, '"', '<'))
 		extract_parenthesis_with_skip_quote(str, '"', '<', '>');

commit bf1a050d4e8f01b50086ac4a15e4537d70d452b4
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Aug 1 10:28:07 2014 +0200

    Actually display "(No From)" in messageview's From column when appropriate.

diff --git a/src/summaryview.c b/src/summaryview.c
index d1f2eee..4986a65 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3350,7 +3350,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 			extract_address(from_text);
 		}
 		if (!from_text)
-			_("(No From)");		
+			from_text = _("(No From)");
 	} else {
 		gchar *tmp = summary_complete_address(msginfo->from);
 		if (tmp) {
@@ -3368,7 +3368,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 					extract_address(from_text);
 			}
 			if (!from_text)
-				_("(No From)");		
+				from_text = _("(No From)");
 		}
 	}
 	

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


hooks/post-receive
-- 
Claws Mail