talons

commit dc972352b438b96729fe39de5014d670fbedcc14
parent 5bfd0b63990d0ed2f366b511906ca516ec124b90
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Wed,  3 Oct 2012 23:22:13 +0000

2012-10-03 [mones]	3.8.1cvs82

	* src/procmime.c
		Fix bug #2743 'null pointer crash in procmime strchr'
		Patch by Michael Schwendt (from RedHat bug 862578)

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/procmime.c
 | 
2
++

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-03 [mones]	3.8.1cvs82
+
+	* src/procmime.c
+		Fix bug #2743 'null pointer crash in procmime strchr'
+		Patch by Michael Schwendt (from RedHat bug 862578) 
+
 2012-09-28 [colin]	3.8.1cvs81
 
 	* src/advsearch.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4456,3 +4456,4 @@
 ( cvs diff -u -r 1.115.2.258 -r 1.115.2.259 src/main.c;  cvs diff -u -r 1.75.2.77 -r 1.75.2.78 src/matcher.c;  cvs diff -u -r 1.39.2.22 -r 1.39.2.23 src/matcher.h;  cvs diff -u -r 1.15.2.73 -r 1.15.2.74 src/summary_search.c;  ) > 3.8.1cvs79.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/advsearch.c;  cvs diff -u -r 1.179.2.264 -r 1.179.2.265 src/imap.c;  cvs diff -u -r 1.1.4.121 -r 1.1.4.122 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/etpan/imap-thread.h;  ) > 3.8.1cvs80.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/advsearch.c;  cvs diff -u -r 1.179.2.265 -r 1.179.2.266 src/imap.c;  ) > 3.8.1cvs81.patchset
+( cvs diff -u -r 1.49.2.152 -r 1.49.2.153 src/procmime.c;  ) > 3.8.1cvs82.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=81
+EXTRA_VERSION=82
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmime.c b/src/procmime.c
@@ -1835,6 +1835,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
 			continue;
 
 		charset = value;
+		if (charset == NULL)
+			continue;
 		lang = strchr(charset, '\'');
 		if (lang == NULL)
 			continue;