talons

commit d993620035460719382093c242f5573df9dc9df5
parent f68ae062172ff04e3b0fcb32fb855d0fb46a0e1b
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 18 Sep 2008 16:03:12 +0000

2008-09-18 [colin]	3.5.0cvs114

	* src/procmime.c
	* src/textview.c
		Check for NULLs before str* functions

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

5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-18 [colin]	3.5.0cvs114
+
+	* src/procmime.c
+	* src/textview.c
+		Check for NULLs before str* functions
+
 2008-09-18 [colin]	3.5.0cvs113
 
 	* src/messageview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3525,3 +3525,4 @@
 ( cvs diff -u -r 1.36.2.145 -r 1.36.2.146 src/common/utils.c;  ) > 3.5.0cvs111.patchset
 ( cvs diff -u -r 1.61.2.86 -r 1.61.2.87 src/account.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/image_viewer.c;  cvs diff -u -r 1.52.2.68 -r 1.52.2.69 src/prefs_folder_item.c;  cvs diff -u -r 1.5.2.38 -r 1.5.2.39 src/prefs_spelling.c;  cvs diff -u -r 1.9.2.62 -r 1.9.2.63 src/gtk/gtkaspell.c;  ) > 3.5.0cvs112.patchset
 ( cvs diff -u -r 1.94.2.186 -r 1.94.2.187 src/messageview.c;  cvs diff -u -r 1.49.2.115 -r 1.49.2.116 src/procmime.c;  cvs diff -u -r 1.96.2.206 -r 1.96.2.207 src/textview.c;  cvs diff -u -r 1.1.4.32 -r 1.1.4.33 src/gtk/logwindow.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/logwindow.h;  ) > 3.5.0cvs113.patchset
+( cvs diff -u -r 1.49.2.116 -r 1.49.2.117 src/procmime.c;  cvs diff -u -r 1.96.2.207 -r 1.96.2.208 src/textview.c;  ) > 3.5.0cvs114.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=113
+EXTRA_VERSION=114
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmime.c b/src/procmime.c
@@ -691,7 +691,7 @@ static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
 		      ? forced_charset : 
 		      procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 
-	if (!forced_charset && !strcasecmp(src_codeset, CS_ISO_8859_1))
+	if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_ISO_8859_1))
 		src_codeset = CS_WINDOWS_1252;
 
 	if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
diff --git a/src/textview.c b/src/textview.c
@@ -932,7 +932,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 		charset = textview->messageview->forced_charset;
 	else {
 		charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
-		if (!strcasecmp(charset, CS_ISO_8859_1))
+		if (charset && !strcasecmp(charset, CS_ISO_8859_1))
 			charset = CS_WINDOWS_1252;
 	}