gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2009-10-21 [wwp] 3.7.3cvs7

Browse source 
* 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).
This commit is contained in:
Tristan Chabredier 2009-10-21 14:07:50 +00:00
parent 358eb11a49
commit c7eb32b1b9
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

1
PATCHSETS
View file

@ -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.36.2.176 -r 1.36.2.177 src/common/utils.c; ) > 3.7.3cvs7.patchset

2
configure.ac
View file

@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=6
EXTRA_VERSION=7
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

5
src/common/utils.c
View file

@ -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);
<<<<<<< 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);
>>>>>>> 1.36.2.176
}
g_free(tmp);
tmp = NULL;