From: Colin Leroy <colin@colino.net>
Date: Sun, 28 Aug 2005 08:21:13 +0000 (+0000)
Subject: 2005-08-28 [colin]	1.9.13cvs67
X-Git-Tag: rel_1_9_14~19
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=cbc10eb3238f007ff412f57348cce90bfa6795fe;ds=sidebyside

2005-08-28 [colin]	1.9.13cvs67

	* src/imap.c
		Fix leak
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0f30ca96c..56ee79f10 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-08-28 [colin]	1.9.13cvs67
+
+	* src/imap.c
+		Fix leak
+
 2005-08-27 [colin]	1.9.13cvs66
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
index 4ebe92d1b..b0fd3dc96 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -752,3 +752,4 @@
 ( cvs diff -u -r 1.25.2.5 -r 1.25.2.6 tools/Makefile.am;  diff -u /dev/null tools/asus_mailled.sh;  ) > 1.9.13cvs64.patchset
 ( cvs diff -u -r 1.213.2.53 -r 1.213.2.54 src/folder.c;  cvs diff -u -r 1.150.2.41 -r 1.150.2.42 src/procmsg.c;  cvs diff -u -r 1.60.2.15 -r 1.60.2.16 src/procmsg.h;  cvs diff -u -r 1.395.2.116 -r 1.395.2.117 src/summaryview.c;  ) > 1.9.13cvs65.patchset
 ( cvs diff -u -r 1.179.2.61 -r 1.179.2.62 src/imap.c;  cvs diff -u -r 1.49.2.57 -r 1.49.2.58 src/procmime.c;  ) > 1.9.13cvs66.patchset
+( cvs diff -u -r 1.179.2.62 -r 1.179.2.63 src/imap.c;  ) > 1.9.13cvs67.patchset
diff --git a/configure.ac b/configure.ac
index 2daabf4a4..00573b781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
index d320ca424..cba08c2d0 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -861,16 +861,18 @@ static void strip_crs(const gchar *file)
 	gchar buf[4096];
 	gchar *out = get_tmp_file();
 	if (file == NULL)
-		return;
+		goto freeout;
 	
 	fp = fopen(file, "rb");
 	if (!fp)
-		return;
+		goto freeout;
 
 	outfp = fopen(out, "wb");
-	if (!outfp)
-		return;
-	
+	if (!outfp) {
+		fclose(fp);
+		goto freeout;
+	}
+
 	while (fgets(buf, sizeof (buf), fp) != NULL) {
 		while (strstr(buf, "\r")) {
 			gchar *cr = strstr(buf, "\r") ;
@@ -884,6 +886,8 @@ static void strip_crs(const gchar *file)
 	fclose(fp);
 	fclose(outfp);
 	rename_force(out, file);
+freeout:
+	g_free(out);
 }
 
 static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,