2006-03-01 [colin] 2.0.0cvs97

	* src/plugins/spamassassin/spamassassin.c
		Fix segfault (g_file_set_contents fails for some
		reason and err==0x2f. Can't find out why with
		valgrind, using working function :-)

diff --git a/ChangeLog b/ChangeLog
index 94bba42d0a4b8fd7919a90f55ac4316a0fe2f064..357a9036edee9138178903ed3cb2d6916a3f3b1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-01 [colin]     2.0.0cvs97
+
+       * src/plugins/spamassassin/spamassassin.c
+               Fix segfault (g_file_set_contents fails for some 
+               reason and err==0x2f. Can't find out why with
+               valgrind, using working function :-)
+

 2006-03-01 [colin]     2.0.0cvs96
 
        * src/inc.c
 2006-03-01 [colin]     2.0.0cvs96
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index c39a5b2f33dbea9f0ee6522bab43c5c3e1af921a..2a79aa9d7c14a85e4fef5492a90dcb710b0387a7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1280,3 +1280,4 @@
 ( cvs diff -u -r 1.382.2.248 -r 1.382.2.249 src/compose.c;  cvs diff -u -r 1.179.2.94 -r 1.179.2.95 src/imap.c;  cvs diff -u -r 1.149.2.43 -r 1.149.2.44 src/inc.c;  cvs diff -u -r 1.29.2.8 -r 1.29.2.9 src/inc.h;  cvs diff -u -r 1.94.2.79 -r 1.94.2.80 src/messageview.c;  cvs diff -u -r 1.101.2.21 -r 1.101.2.22 src/news.c;  cvs diff -u -r 1.18.2.27 -r 1.18.2.28 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs94.patchset
 ( cvs diff -u -r 1.27.2.16 -r 1.27.2.17 src/addr_compl.c;  cvs diff -u -r 1.22.2.7 -r 1.22.2.8 src/addrbook.c;  cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/addressbook.c;  cvs diff -u -r 1.28.2.14 -r 1.28.2.15 src/addrindex.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/folder_item_prefs.c;  cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/headerview.c;  cvs diff -u -r 1.179.2.95 -r 1.179.2.96 src/imap.c;  cvs diff -u -r 1.149.2.44 -r 1.149.2.45 src/inc.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/ldif.c;  cvs diff -u -r 1.274.2.101 -r 1.274.2.102 src/mainwindow.c;  cvs diff -u -r 1.79.2.23 -r 1.79.2.24 src/mh.c;  cvs diff -u -r 1.16.2.29 -r 1.16.2.30 src/msgcache.c;  cvs diff -u -r 1.103.2.42 -r 1.103.2.43 src/prefs_common.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_msg_colors.c;  cvs diff -u -r 1.47.2.26 -r 1.47.2.27 src/procheader.c;  cvs diff -u -r 1.11.2.5 -r 1.11.2.6 src/procheader.h;  cvs diff -u -r 1.49.2.73 -r 1.49.2.74 src/procmime.c;  cvs diff -u -r 1.150.2.55 -r 1.150.2.56 src/procmsg.c;  cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/procmsg.h;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/send_message.h;  cvs diff -u -r 1.1.16.2 -r 1.1.16.3 src/simple-gettext.c;  cvs diff -u -r 1.395.2.177 -r 1.395.2.178 src/summaryview.c;  cvs diff -u -r 1.68.2.17 -r 1.68.2.18 src/summaryview.h;  cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/syldap.c;  cvs diff -u -r 1.96.2.97 -r 1.96.2.98 src/textview.c;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/undo.c;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/common/ssl_certificate.c;  cvs diff -u -r 1.36.2.56 -r 1.36.2.57 src/common/utils.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/colorsel.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtkshruler.c;  cvs diff -u -r 1.14.2.33 -r 1.14.2.34 src/plugins/trayicon/trayicon.c;  ) > 2.0.0cvs95.patchset
 ( cvs diff -u -r 1.149.2.45 -r 1.149.2.46 src/inc.c;  ) > 2.0.0cvs96.patchset
 ( cvs diff -u -r 1.382.2.248 -r 1.382.2.249 src/compose.c;  cvs diff -u -r 1.179.2.94 -r 1.179.2.95 src/imap.c;  cvs diff -u -r 1.149.2.43 -r 1.149.2.44 src/inc.c;  cvs diff -u -r 1.29.2.8 -r 1.29.2.9 src/inc.h;  cvs diff -u -r 1.94.2.79 -r 1.94.2.80 src/messageview.c;  cvs diff -u -r 1.101.2.21 -r 1.101.2.22 src/news.c;  cvs diff -u -r 1.18.2.27 -r 1.18.2.28 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs94.patchset
 ( cvs diff -u -r 1.27.2.16 -r 1.27.2.17 src/addr_compl.c;  cvs diff -u -r 1.22.2.7 -r 1.22.2.8 src/addrbook.c;  cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/addressbook.c;  cvs diff -u -r 1.28.2.14 -r 1.28.2.15 src/addrindex.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/folder_item_prefs.c;  cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/headerview.c;  cvs diff -u -r 1.179.2.95 -r 1.179.2.96 src/imap.c;  cvs diff -u -r 1.149.2.44 -r 1.149.2.45 src/inc.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/ldif.c;  cvs diff -u -r 1.274.2.101 -r 1.274.2.102 src/mainwindow.c;  cvs diff -u -r 1.79.2.23 -r 1.79.2.24 src/mh.c;  cvs diff -u -r 1.16.2.29 -r 1.16.2.30 src/msgcache.c;  cvs diff -u -r 1.103.2.42 -r 1.103.2.43 src/prefs_common.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_msg_colors.c;  cvs diff -u -r 1.47.2.26 -r 1.47.2.27 src/procheader.c;  cvs diff -u -r 1.11.2.5 -r 1.11.2.6 src/procheader.h;  cvs diff -u -r 1.49.2.73 -r 1.49.2.74 src/procmime.c;  cvs diff -u -r 1.150.2.55 -r 1.150.2.56 src/procmsg.c;  cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/procmsg.h;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/send_message.h;  cvs diff -u -r 1.1.16.2 -r 1.1.16.3 src/simple-gettext.c;  cvs diff -u -r 1.395.2.177 -r 1.395.2.178 src/summaryview.c;  cvs diff -u -r 1.68.2.17 -r 1.68.2.18 src/summaryview.h;  cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/syldap.c;  cvs diff -u -r 1.96.2.97 -r 1.96.2.98 src/textview.c;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/undo.c;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/common/ssl_certificate.c;  cvs diff -u -r 1.36.2.56 -r 1.36.2.57 src/common/utils.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/colorsel.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtkshruler.c;  cvs diff -u -r 1.14.2.33 -r 1.14.2.34 src/plugins/trayicon/trayicon.c;  ) > 2.0.0cvs95.patchset
 ( cvs diff -u -r 1.149.2.45 -r 1.149.2.46 src/inc.c;  ) > 2.0.0cvs96.patchset

+( cvs diff -u -r 1.18.2.28 -r 1.18.2.29 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs97.patchset

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

-EXTRA_VERSION=96
+EXTRA_VERSION=97

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index b8f87401d8b8c055ee2807285df0c29631ba8d22..e4c5f1772ba82fcaf24b9b28010a04ad83ac791f 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -263,7 +263,6 @@ gchar* spamassassin_create_tmp_spamc_wrapper(gboolean spam)
 {
        gchar *contents;
        gchar *fname = get_tmp_file();
 {
        gchar *contents;
        gchar *fname = get_tmp_file();

-       GError *err;

 
        if (fname != NULL) {
                contents = g_strdup_printf(
 
        if (fname != NULL) {
                contents = g_strdup_printf(


@@ -271,10 +270,7 @@ gchar* spamassassin_create_tmp_spamc_wrapper(gboolean spam)
                                                config.hostname, config.port, 
                                                config.username, config.timeout,
                                                config.max_size * 1024, spam?"spam":"ham");
                                                config.hostname, config.port, 
                                                config.username, config.timeout,
                                                config.max_size * 1024, spam?"spam":"ham");

-               if (!g_file_set_contents(fname, contents,
-                                                       strlen(contents), &err)) {
-                       g_warning(err->message);
-                       g_error_free(err);
+               if (str_write_to_file(contents, fname) < 0) {

                        g_free(fname);
                        fname = NULL;
                }
                        g_free(fname);
                        fname = NULL;
                }