2005-03-20 [thorsten] 1.9.6cvs3

	* src/procmime.c
		fix mimetype detection (referenced free()d string)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0f5baf6bc9e58a616a2cf1c38322cca9b6394da9..38cdb219ee79a2b92dc71449cc45944aafc9f9ac 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-03-20 [thorsten]  1.9.6cvs3
+
+       * src/procmime.c
+               fix mimetype detection (referenced free()d string)
+
 2005-03-20 [paul]      1.9.6cvs2
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index ab7c4809917460a5e5086cb23e318e5d82b97306..537b3a608ea2a1bf2b96f1aa7ce3cdb9aac557c1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -419,3 +419,4 @@
 ( cvs diff -u -r 1.100.2.13 -r 1.100.2.14 AUTHORS; cvs diff -u -r 1.2504.2.53 -r 1.2504.2.54 ChangeLog.claws; cvs diff -u -r 1.654.2.451 -r 1.654.2.452 configure.ac; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/gtk/about.c; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/sylpheed_logo.xpm; ) > 1.0.3cvs3.1.patchset
 ( cvs diff -u -r 1.395.2.60 -r 1.395.2.61 src/summaryview.c; cvs diff -u -r 1.68.2.5 -r 1.68.2.6 src/summaryview.h; ) > 1.9.6cvs1.patchset
 ( cvs diff -u -r 1.382.2.111 -r 1.382.2.112 src/compose.c; ) > 1.9.6cvs2.patchset
+( cvs diff -u -r 1.49.2.36 -r 1.49.2.37 src/procmime.c; ) > 1.9.6cvs3.patchset

diff --git a/configure.ac b/configure.ac
index ff9d55658960d71ea55f3aee3b279badad643c6e..a6b7a501ff32623b7e3ee910a35b499bdc1ece8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmime.c b/src/procmime.c
index 467dd540e3dcb14070b663880a2107888d3e1b3c..7a2732aa53d4d2f78f879069464a97fa13ec3522 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -920,11 +920,11 @@ gchar *procmime_get_mime_type(const gchar *filename)
        }
 
        base = g_path_get_basename(filename);
-       p = strrchr(base, '.');
+       if ((p = strrchr(base, '.')) != NULL)
+               Xstrdup_a(ext, p + 1, p = NULL );
        g_free(base);
        if (!p) return NULL;
 
-       Xstrdup_a(ext, p + 1, return NULL);
        g_strdown(ext);
        mime_type = g_hash_table_lookup(mime_type_table, ext);
        if (mime_type) {