2004-12-07 [thorsten] 0.9.13cvs4

	* src/procmime.c
		fix leak introduced with 0.9.13cvs1

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7bb9a80ac1acd5b0a4a7cedb40f13e24d6d5e09c..fd2160cf2ecc9bfd0eaab9cb8f0c3fa1e78c0886 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-12-07 [thorsten]  0.9.13cvs4
+
+       * src/procmime.c
+               fix leak introduced with 0.9.13cvs1
+

 2004-12-07 [keith]     0.9.13cvs3
 
        * src/procmime.c
 2004-12-07 [keith]     0.9.13cvs3
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 4ea28815270812103f83b3ef903f9a8d67b7eeaa..504bbb75c282148187f4fe80f0eb85ee5b6770c5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -172,3 +172,4 @@
 ( cvs diff -u -r 1.462 -r 1.463 src/compose.c; ) > 0.9.12cvs187.patchset
 ( cvs diff -u -r 1.97 -r 1.98 src/procmime.c; ) > 0.9.13cvs1.patchset
 ( cvs diff -u -r 1.122 -r 1.123 AUTHORS; cvs diff -u -r 1.122 -r 1.123 src/prefs_account.c; cvs diff -u -r 1.19 -r 1.20 src/common/smtp.c; cvs diff -u -r 1.9 -r 1.10 src/common/smtp.h; ) > 0.9.13cvs2.patchset
 ( cvs diff -u -r 1.462 -r 1.463 src/compose.c; ) > 0.9.12cvs187.patchset
 ( cvs diff -u -r 1.97 -r 1.98 src/procmime.c; ) > 0.9.13cvs1.patchset
 ( cvs diff -u -r 1.122 -r 1.123 AUTHORS; cvs diff -u -r 1.122 -r 1.123 src/prefs_account.c; cvs diff -u -r 1.19 -r 1.20 src/common/smtp.c; cvs diff -u -r 1.9 -r 1.10 src/common/smtp.h; ) > 0.9.13cvs2.patchset

+( cvs diff -u -r 1.99 -r 1.100 src/procmime.c; ) > 0.9.13cvs4.patchset

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

-EXTRA_VERSION=3
+EXTRA_VERSION=4

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/procmime.c b/src/procmime.c
index 64352255793a647e94bf6c0205dcd1ed90e0b36f..b035ab29a17f7e1a8d7ae97eff7a03ed5d60ac28 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -867,7 +867,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
                if (basetmp == NULL)
                        basetmp = "mimetmp";
                base = g_basename(basetmp);
                if (basetmp == NULL)
                        basetmp = "mimetmp";
                base = g_basename(basetmp);

-               if (*base == '\0') base = g_strdup("mimetmp");
+               if (*base == '\0') base = "mimetmp";

                Xstrdup_a(base, base, return NULL);
                subst_for_shellsafe_filename(base);
        }
                Xstrdup_a(base, base, return NULL);
                subst_for_shellsafe_filename(base);
        }