From: Paul Mangan <paul@claws-mail.org>
Date: Sat, 15 Jan 2005 10:01:13 +0000 (+0000)
Subject: 2005-01-15 [paul]	0.9.13cvs34
X-Git-Tag: rel_1_0_0~11
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1b821244945e41b076371d3dcde820542f64112e

2005-01-15 [paul]	0.9.13cvs34

	* ChangeLog
	* ChangeLog.jp
	* src/common/template.c
		sync with main, see ChangeLog 2005-01-11
		(fix potential memory corruption bug)
---

diff --git a/ChangeLog b/ChangeLog
index 9011f9841..0baccf093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-11
+
+	* src/template.c: template_write_config(): fixed potential memory
+	  corruption bug.
+
 2005-01-06
 
 	* src/pop.[ch]: added POP3_DONE to Pop3State (it is set when logout
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2e8300194..af3f6fab4 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2005-01-15 [paul]	0.9.13cvs34
+
+	* ChangeLog
+	* ChangeLog.jp
+	* src/common/template.c
+		sync with main, see ChangeLog 2005-01-11
+		(fix potential memory corruption bug)
+
 2005-01-14 [colin]	0.9.13cvs33
 
 	* src/html.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 3064b8196..f7c6b1e3e 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2005-01-11
+
+	* src/template.c: template_write_config(): ÀøºßŪ¤Ê¥á¥â¥êÇ˲õ¥Ð¥°
+	  ¤ò½¤Àµ¡£
+
 2005-01-06
 
 	* src/pop.[ch]: Pop3State ¤Ë POP3_DONE ¤òÄɲÃ(¥í¥°¥¢¥¦¥È¤¬´°Î»¤·¤¿
diff --git a/PATCHSETS b/PATCHSETS
index 70c62facc..af7f1e919 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -203,3 +203,4 @@
 ( cvs diff -u -r 1.1 -r 1.2 tools/calypso_convert.pl; ) > 0.9.13cvs31.patchset
 ( cvs diff -u -r 1.29 -r 1.30 src/msgcache.c; cvs diff -u -r 1.14 -r 1.15 src/html.c; cvs diff -u -r 1.3 -r 1.4 src/html.h; cvs diff -u -r 1.126 -r 1.127 AUTHORS; ) > 0.9.13cvs32.patchset
 ( cvs diff -u -r 1.15 -r 1.16 src/html.c; cvs diff -u -r 1.30 -r 1.31 src/msgcache.c; ) > 0.9.13cvs33.patchset
+( cvs diff -u -r 1.454 -r 1.455 ChangeLog; cvs diff -u -r 1.449 -r 1.450 ChangeLog.jp; cvs diff -u -r 1.2 -r 1.3 src/common/template.c; ) > 0.9.13cvs34.patchset
diff --git a/configure.ac b/configure.ac
index 9bf240c76..1f131419b 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=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/common/template.c b/src/common/template.c
index 15f12fe93..9d6769a9d 100644
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -1,7 +1,7 @@
 /*
  * Sylpheed templates subsystem 
  * Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001 Hiroyuki Yamamoto
+ * Copyright (C) 2001-2004 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -190,7 +190,6 @@ void template_write_config(GSList *tmpl_list)
 		if ((fp = fopen(filename, "wb")) == NULL) {
 			FILE_OP_ERROR(filename, "fopen");
 			g_free(filename);
-			g_free(path);
 			return;
 		}