2005-10-22 [colin] 1.9.15cvs93

	* src/codeconv.c
		Fix leak

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 9a9f53ba44ac2bf906faf69cbeda2474f96c47a6..7f53487da0c3e7f365b856e3de7d5b267f29cd2f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-10-22 [colin]     1.9.15cvs93
+
+       * src/codeconv.c
+               Fix leak
+
 2005-10-22 [colin]     1.9.15cvs92
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index f8c3ea727a3c0b7f1bd152c1dea957dc8842fac6..c2a8fecf12f60ad0174e04a8fb634702f38c4ab8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -929,3 +929,4 @@
 ( cvs diff -u -r 1.382.2.186 -r 1.382.2.187 src/compose.c;  ) > 1.9.15cvs90.patchset
 ( cvs diff -u -r 1.2.16.1 -r 1.2.16.2 src/pixmaps/new.xpm;  cvs diff -u -r 1.2.16.2 -r 1.2.16.3 src/pixmaps/unread.xpm;  ) > 1.9.15cvs91.patchset
 ( cvs diff -u -r 1.65.2.41 -r 1.65.2.42 src/codeconv.c;  ) > 1.9.15cvs92.patchset
+( cvs diff -u -r 1.65.2.42 -r 1.65.2.43 src/codeconv.c;  ) > 1.9.15cvs93.patchset

diff --git a/configure.ac b/configure.ac
index 0d77ed211d835767803f8d21cee56c48e0b29d1e..5c53c2e187134a27c5ccdaf071999092b2215efa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/codeconv.c b/src/codeconv.c
index e3a9a834aa616c55e7d93a98ba092bb3adee1372..b9920685ebb5ccfc122abd2b401d9e104fb83b91 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -696,8 +696,12 @@ void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
        if (tmpstr && g_utf8_validate(tmpstr, -1, NULL)) {
                strncpy2(outbuf, tmpstr, outlen);
                g_free(tmpstr);
-       } else
+               return;
+       } else {
+               if (tmpstr)
+                       g_free(tmpstr);
                conv_utf8todisp(outbuf, outlen, inbuf);
+       }
 }
 
 static void conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)