From f2f2f9c3fa6685ed4b1ee64b8c3db385a64ccf3f Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 16 Sep 2007 18:36:36 +0000 Subject: [PATCH] 2007-09-16 [colin] 3.0.0cvs18 * src/folder.c Fix possible memleak --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a12dae240..dfeedbd51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-16 [colin] 3.0.0cvs18 + + * src/folder.c + Fix possible memleak + 2007-09-16 [colin] 3.0.0cvs17 * src/folderview.c diff --git a/PATCHSETS b/PATCHSETS index 94f86b411..0d17b5321 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2863,3 +2863,4 @@ ( cvs diff -u -r 1.59.2.57 -r 1.59.2.58 src/prefs_filtering.c; cvs diff -u -r 1.6.2.7 -r 1.6.2.8 src/prefs_filtering.h; cvs diff -u -r 1.1.4.39 -r 1.1.4.40 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/tags.c; ) > 3.0.0cvs15.patchset ( cvs diff -u -r 1.61.2.68 -r 1.61.2.69 src/account.c; cvs diff -u -r 1.382.2.408 -r 1.382.2.409 src/compose.c; cvs diff -u -r 1.105.2.109 -r 1.105.2.110 src/prefs_account.c; cvs diff -u -r 1.49.2.33 -r 1.49.2.34 src/prefs_account.h; cvs diff -u -r 1.12.2.47 -r 1.12.2.48 src/prefs_template.c; cvs diff -u -r 1.36.2.110 -r 1.36.2.111 src/common/utils.c; ) > 3.0.0cvs16.patchset ( cvs diff -u -r 1.207.2.182 -r 1.207.2.183 src/folderview.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/image_viewer.c; cvs diff -u -r 1.75.2.47 -r 1.75.2.48 src/matcher.c; cvs diff -u -r 1.94.2.150 -r 1.94.2.151 src/messageview.c; cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/common/plugin.c; ) > 3.0.0cvs17.patchset +( cvs diff -u -r 1.213.2.160 -r 1.213.2.161 src/folder.c; ) > 3.0.0cvs18.patchset diff --git a/configure.ac b/configure.ac index 39d2f57f4..ab846a063 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=17 +EXTRA_VERSION=18 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index 372981657..02c5afb36 100644 --- a/src/folder.c +++ b/src/folder.c @@ -3477,9 +3477,10 @@ gint folder_item_remove_msg(FolderItem *item, gint num) if (!item->cache) folder_item_read_cache(item); msginfo = msgcache_get_msg(item->cache, num); - if (MSG_IS_LOCKED(msginfo->flags)) + if (MSG_IS_LOCKED(msginfo->flags)) { + procmsg_msginfo_free(msginfo); return -1; - + } ret = folder->klass->remove_msg(folder, item, num); if (msginfo != NULL) { -- 2.25.1