[Commits] [SCM] claws branch, master, updated. 3.14.0-77-g93354c8

mones at claws-mail.org mones at claws-mail.org
Mon Sep 12 17:24:23 CEST 2016


The branch, master has been updated
       via  93354c8ef6ea8f1729e878c6c765efd5b100bc0e (commit)
      from  00ba843d3929598a46aed80eab703d039cde6bc9 (commit)

Summary of changes:
 src/textview.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 93354c8ef6ea8f1729e878c6c765efd5b100bc0e
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Sep 12 17:23:18 2016 +0200

    Fix potential segfault
    
    Syslog message was:
    [5473572.496127] claws-mail[24080]: segfault at 22 ip
     00000000005704ce sp 00007ffdf1dfcea0 error 4 in
     claws-mail[400000+34a000]
    
    $ addr2line -e /…/claws-mail 00000000005704ce
    /…/src/textview.c:837
    
    More details on: http://stackoverflow.com/questions/2179403

diff --git a/src/textview.c b/src/textview.c
index 8f22644..b4c74c7 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -894,8 +894,9 @@ static void recursive_add_parts(TextView *textview, GNode *node)
 static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
 {
 	cm_return_if_fail(mimeinfo != NULL);
-        
-        recursive_add_parts(textview, mimeinfo->node);
+	cm_return_if_fail(mimeinfo->node != NULL);
+
+	recursive_add_parts(textview, mimeinfo->node);
 }
 
 void textview_show_error(TextView *textview)

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list