From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 4/4] lib/database: delete stemmer on destroy
Date: Sun, 9 Jan 2022 10:38:05 -0400 [thread overview]
Message-ID: <20220109143805.3682660-5-david@tethera.net> (raw)
In-Reply-To: <20220109143805.3682660-1-david@tethera.net>
Commit [0] left the stemmer object accessible, but did not add
de-allocation code to notmuch_database_destroy. This commit corrects
that oversight.
Leak originally reported by Austin Ray [1].
[0]: 3202e0d1feba1ab955ba1c07098c00208f8f0ada
[1]: id:20220105224538.m36lnjn7rf3ieonc@athena
---
lib/database.cc | 2 ++
test/T800-asan.sh | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/database.cc b/lib/database.cc
index 6ef56d56..a012ebcf 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -753,6 +753,8 @@ notmuch_database_destroy (notmuch_database_t *notmuch)
notmuch->date_range_processor = NULL;
delete notmuch->last_mod_range_processor;
notmuch->last_mod_range_processor = NULL;
+ delete notmuch->stemmer;
+ notmuch->stemmer = NULL;
talloc_free (notmuch);
diff --git a/test/T800-asan.sh b/test/T800-asan.sh
index 8c294578..8607732e 100755
--- a/test/T800-asan.sh
+++ b/test/T800-asan.sh
@@ -12,7 +12,6 @@ add_email_corpus
TEST_CFLAGS="-fsanitize=address"
test_begin_subtest "open and destroy"
-test_subtest_known_broken
test_C ${MAIL_DIR} ${NOTMUCH_CONFIG} <<EOF
#include <notmuch.h>
#include <stdio.h>
--
2.34.1
next prev parent reply other threads:[~2022-01-09 14:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 14:38 v2 fix leaks in n_d_open_with_config David Bremner
2022-01-09 14:38 ` [PATCH v2 1/4] configure: check for ASAN support David Bremner
2022-01-09 14:38 ` [PATCH v2 2/4] test: add known broken test for memory leaks in open David Bremner
2022-01-09 14:38 ` [PATCH v2 3/4] lib/config: move g_key_File_get_string before continue David Bremner
2022-01-09 14:38 ` David Bremner [this message]
2022-01-22 20:54 ` v2 fix leaks in n_d_open_with_config Austin Ray
2022-01-23 1:24 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220109143805.3682660-5-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).