From be5f95249a98a479d0f7c9eea339f1d2f58215f4 Mon Sep 17 00:00:00 2001 From: Alfons Hoogervorst Date: Fri, 30 Aug 2002 19:08:40 +0000 Subject: [PATCH] * AUTHORS add Martin Kluge * src/mh.c apply memory leak plug patch by Martin Kluge (closes "[ 602568 ] patch for 602441 little memory leak" and "[ 602441 ] memoryleak in filtering 0.8.2claws9?") --- AUTHORS | 1 + ChangeLog.claws | 9 +++++++++ configure.in | 2 +- src/mh.c | 14 ++++++-------- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1797b7999..f848d6de3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -154,3 +154,4 @@ contributors (beside the above; based on Changelog) Xavier FACQ Botalov Vyacheslav Urosevic Aleksandar + Martin Kluge diff --git a/ChangeLog.claws b/ChangeLog.claws index 18e402f53..a765a3f88 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,12 @@ +2002-08-30 [alfons] 0.8.2claws12 + + * AUTHORS + add Martin Kluge + * src/mh.c + apply memory leak plug patch by Martin Kluge + (closes "[ 602568 ] patch for 602441 little memory leak" + and "[ 602441 ] memoryleak in filtering 0.8.2claws9?") + 2002-08-30 [darko] 0.8.2claws11 * src/folderview.c diff --git a/configure.in b/configure.in index 1e515ff81..4ec671905 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=8 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws11 +EXTRA_VERSION=claws12 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/mh.c b/src/mh.c index 83f80c878..4dd1ee7de 100644 --- a/src/mh.c +++ b/src/mh.c @@ -620,19 +620,17 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo) prefs = dest->prefs; - destfile = mh_get_new_msg_filename(dest); - g_return_val_if_fail(destfile != NULL, -1); - - debug_print("Copying message %s%c%d to %s ...\n", - msginfo->folder->path, G_DIR_SEPARATOR, - msginfo->msgnum, dest->path); - srcfile = procmsg_get_message_file(msginfo); destfile = mh_get_new_msg_filename(dest); - if(!destfile) { + if (!destfile) { g_free(srcfile); return -1; } + + debug_print("Copying message %s%c%d to %s ...\n", + msginfo->folder->path, G_DIR_SEPARATOR, + msginfo->msgnum, dest->path); + if (copy_file(srcfile, destfile, TRUE) < 0) { FILE_OP_ERROR(srcfile, "copy"); -- 2.25.1