From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Sun, 17 Mar 2002 14:05:37 +0000 (+0000)
Subject: more stringent checks for NULL params when writing filtering actions to a file
X-Git-Tag: rel_0_7_5~118
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1d4a2c563a36adc0448792c68c98abf79db618be;hp=072fd8a56a15a405d1a04e4843e6e1de561b5721

more stringent checks for NULL params when writing filtering actions to a file
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e10ea6fc2..789df7c3a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-03-17 [alfons]	0.7.4claws20
+
+	* src/matcher.c
+		more stringent checks for NULL params when writing
+		filtering actions to a file
+		
 2002-03-17 [hoa]	0.7.3claws20
 
 	* src/news.c
diff --git a/configure.in b/configure.in
index 5147e4f4c..4deeda29f 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/matcher.c b/src/matcher.c
index 18526a3bf..f85878154 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1061,8 +1061,11 @@ static void prefs_filtering_write(FILE * fp, GSList * prefs_scoring)
 		gchar *filtering_str;
 		FilteringProp * prop;
 
-		prop = (FilteringProp *) cur->data;
-		filtering_str = filteringprop_to_string(prop);
+		if (NULL == (prop = (FilteringProp *) cur->data))
+			continue;
+		
+		if (NULL == (filtering_str = filteringprop_to_string(prop)))
+			continue;
 		
 		if (fputs(filtering_str, fp) == EOF ||
 		    fputc('\n', fp) == EOF) {