cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid a null pointer deref in claws-mail;

Browse Source 
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2743
This commit is contained in:
sthen 2012-10-09 17:01:15 +00:00
parent b73f874efc
commit a578b37381
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/claws-mail/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2012/10/09 16:41:29 sthen Exp $ # $OpenBSD: Makefile,v 1.55 2012/10/09 17:01:15 sthen Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -9,7 +9,9 @@ COMMENT-spamassassin= spamassassin plugin
V= 3.8.1 V= 3.8.1
DISTNAME= claws-mail-${V} DISTNAME= claws-mail-${V}
REVISION= 0 REVISION-main= 1
REVISION-bogofilter= 0
REVISION-spamassassin= 0
PKGNAME-main= ${DISTNAME} PKGNAME-main= ${DISTNAME}
PKGNAME-bogofilter= claws-mail-bogofilter-${V} PKGNAME-bogofilter= claws-mail-bogofilter-${V}
PKGNAME-spamassassin= claws-mail-spamassassin-${V} PKGNAME-spamassassin= claws-mail-spamassassin-${V}

16
mail/claws-mail/patches/patch-src_procmime_c
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-src_procmime_c,v 1.7 2012/06/29 14:02:54 landry Exp $ $OpenBSD: patch-src_procmime_c,v 1.8 2012/10/09 17:01:16 sthen Exp $
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2640 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2640
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2641 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2641
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2642 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2642
--- src/procmime.c.orig Fri Dec 16 09:09:32 2011 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2743
+++ src/procmime.c Tue Apr 3 14:59:40 2012 --- src/procmime.c.orig Wed Jun 27 11:05:22 2012
+++ src/procmime.c Tue Oct 9 18:51:08 2012
@@ -562,16 +562,29 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, E @@ -562,16 +562,29 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, E
g_free(tmp_file); g_free(tmp_file);
} }
@ -164,3 +165,12 @@ http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2642
} else { } else {
debug_print("using 7bit\n"); debug_print("using 7bit\n");
return ENC_7BIT; return ENC_7BIT;
@@ -1753,6 +1814,8 @@ static void parse_parameters(const gchar *parameters,
continue;
charset = value;
+ if (charset == NULL)
+ continue;
lang = strchr(charset, '\'');
if (lang == NULL)
continue;