2009-10-21 [wwp] 3.7.3cvs7

	* src/common/utils.c
		Don't core dump when attempting to insert a non-existing
		file using a mailto: uri (g_error does core dump).

diff --git a/ChangeLog b/ChangeLog
index 4800c49544c610412d2c3b7665e1d76bef913da3..16dc685ec7333c8814a9afaeff6c0dff0961e436 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-21 [wwp]       3.7.3cvs7
+
+       * src/common/utils.c
+               Don't core dump when attempting to insert a non-existing
+               file using a mailto: uri (g_error does core dump).
+

 2009-10-20 [colin]     3.7.3cvs6
 
        * src/common/utils.c
 2009-10-20 [colin]     3.7.3cvs6
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index f2ed7f733e71d6456690e194315c8643638d6c16..3a11744cd1f7299ba15d38e10c116a8346e2485a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3880,3 +3880,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/w32lib.h;  ) > 3.7.3cvs4.patchset
 ( cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.3cvs5.patchset
 ( cvs diff -u -r 1.36.2.175 -r 1.36.2.176 src/common/utils.c;  ) > 3.7.3cvs6.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/w32lib.h;  ) > 3.7.3cvs4.patchset
 ( cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.3cvs5.patchset
 ( cvs diff -u -r 1.36.2.175 -r 1.36.2.176 src/common/utils.c;  ) > 3.7.3cvs6.patchset

+( cvs diff -u -r 1.36.2.176 -r 1.36.2.177 src/common/utils.c;  ) > 3.7.3cvs7.patchset

diff --git a/configure.ac b/configure.ac
index 632f5cbcbb82d3164fac53e617ce6dc5071c2146..bb47e839a4f4ebda3ba11188c748d14d60e0b261 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index a3d02088d1e9f309fbb7b82556443ee9fb76c467..a16551180b0a14c19df81f996af2473bcd2f6d7c 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1635,8 +1635,13 @@ gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc,
                        *body = decode_uri_gdup(value);
                } else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
                        gchar *tmp = decode_uri_gdup(value);
                        *body = decode_uri_gdup(value);
                } else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
                        gchar *tmp = decode_uri_gdup(value);

+<<<<<<< utils.c
+                       if (!g_file_get_contents(value, body, NULL, NULL)) {
+                               g_warning("Error: couldn't set insert file '%s' in body\n", value);
+=======

                        if (!g_file_get_contents(tmp, body, NULL, NULL)) {
                                g_warning("Error: couldn't set insert file '%s' in body\n", value);
                        if (!g_file_get_contents(tmp, body, NULL, NULL)) {
                                g_warning("Error: couldn't set insert file '%s' in body\n", value);

+>>>>>>> 1.36.2.176

                        }
                        g_free(tmp);
                        tmp = NULL;
                        }
                        g_free(tmp);
                        tmp = NULL;