2005-05-04 [colin] 1.9.6cvs51

	* src/common/utils.c
		Fix crash when subst_for_filename is called
		with a NULL parameter

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 74c7723ead6bcf8d05fd958ad0fb75f805cec3b4..f88946da130100f3afed4e849301f87a079edff7 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-05-04 [colin]     1.9.6cvs51
+
+       * src/common/utils.c
+               Fix crash when subst_for_filename is called
+               with a NULL parameter
+

 2005-05-04 [colin]     1.9.6cvs50
 
        * src/partial_download.c
 2005-05-04 [colin]     1.9.6cvs50
 
        * src/partial_download.c

diff --git a/PATCHSETS b/PATCHSETS
index bf8803067d041622f76f39142352044592655cab..920e3c0e2c25ad17e2f1c82dd9517db273969cc1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -467,3 +467,4 @@
 ( cvs diff -u -r 1.382.2.118 -r 1.382.2.119 src/compose.c; ) > 1.9.6cvs48.patchset
 ( cvs diff -u -r 1.49.2.38 -r 1.49.2.39 src/procmime.c; ) > 1.9.6cvs49.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/partial_download.c; cvs diff -u -r 1.56.2.33 -r 1.56.2.34 src/pop.c; ) > 1.9.6cvs50.patchset
 ( cvs diff -u -r 1.382.2.118 -r 1.382.2.119 src/compose.c; ) > 1.9.6cvs48.patchset
 ( cvs diff -u -r 1.49.2.38 -r 1.49.2.39 src/procmime.c; ) > 1.9.6cvs49.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/partial_download.c; cvs diff -u -r 1.56.2.33 -r 1.56.2.34 src/pop.c; ) > 1.9.6cvs50.patchset

+( cvs diff -u -r 1.36.2.28 -r 1.36.2.29 src/common/utils.c; ) > 1.9.6cvs51.patchset

diff --git a/configure.ac b/configure.ac
index fa9e5ce2fd0bcc12e9af0987bd49d4be5a459046..ff0025f6d2072f5c8a66feef8ba0aa2ab41b5b27 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=50
+EXTRA_VERSION=51

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index cc6c0f654fd2fadf24ea5894ce2fa6569ebb4be6..30f0fd52a7c9af838ac3dd42217b6e3385499cd4 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1084,11 +1084,15 @@ void subst_chars(gchar *str, gchar *orig, gchar subst)
 
 void subst_for_filename(gchar *str)
 {
 
 void subst_for_filename(gchar *str)
 {

+       if (!str)
+               return;

        subst_chars(str, "\t\r\n\\/*", '_');
 }
 
 void subst_for_shellsafe_filename(gchar *str)
 {
        subst_chars(str, "\t\r\n\\/*", '_');
 }
 
 void subst_for_shellsafe_filename(gchar *str)
 {

+       if (!str)
+               return;

        subst_for_filename(str);
        subst_chars(str, " \"'|&;()<>'!{}[]",'_');
 }
        subst_for_filename(str);
        subst_chars(str, " \"'|&;()<>'!{}[]",'_');
 }