From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/6] lib: Clean up error handling in _notmuch_thread_create
Date: Sat, 24 Nov 2012 23:57:02 -0500 [thread overview]
Message-ID: <1353819427-13182-2-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1353819427-13182-1-git-send-email-amdragon@mit.edu>
Previously, there were various opportunities for memory leaks in the
error-handling paths of this function. Use a local talloc context and
some reparenting to make eliminate these leaks, while keeping the
control flow simple.
---
lib/thread.cc | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/lib/thread.cc b/lib/thread.cc
index e976d64..aed87b1 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -406,7 +406,8 @@ _notmuch_thread_create (void *ctx,
notmuch_string_list_t *exclude_terms,
notmuch_sort_t sort)
{
- notmuch_thread_t *thread;
+ void *local = talloc_new (ctx);
+ notmuch_thread_t *thread = NULL;
notmuch_message_t *seed_message;
const char *thread_id;
char *thread_id_query_string;
@@ -415,24 +416,23 @@ _notmuch_thread_create (void *ctx,
notmuch_messages_t *messages;
notmuch_message_t *message;
- seed_message = _notmuch_message_create (ctx, notmuch, seed_doc_id, NULL);
+ seed_message = _notmuch_message_create (local, notmuch, seed_doc_id, NULL);
if (! seed_message)
INTERNAL_ERROR ("Thread seed message %u does not exist", seed_doc_id);
thread_id = notmuch_message_get_thread_id (seed_message);
- thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
+ thread_id_query_string = talloc_asprintf (local, "thread:%s", thread_id);
if (unlikely (thread_id_query_string == NULL))
- return NULL;
+ goto DONE;
- thread_id_query = notmuch_query_create (notmuch, thread_id_query_string);
+ thread_id_query = talloc_steal (
+ local, notmuch_query_create (notmuch, thread_id_query_string));
if (unlikely (thread_id_query == NULL))
- return NULL;
+ goto DONE;
- talloc_free (thread_id_query_string);
-
- thread = talloc (ctx, notmuch_thread_t);
+ thread = talloc (local, notmuch_thread_t);
if (unlikely (thread == NULL))
- return NULL;
+ goto DONE;
talloc_set_destructor (thread, _notmuch_thread_destructor);
@@ -451,8 +451,10 @@ _notmuch_thread_create (void *ctx,
free, NULL);
thread->message_list = _notmuch_message_list_create (thread);
- if (unlikely (thread->message_list == NULL))
- return NULL;
+ if (unlikely (thread->message_list == NULL)) {
+ thread = NULL;
+ goto DONE;
+ }
thread->message_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
free, NULL);
@@ -489,12 +491,15 @@ _notmuch_thread_create (void *ctx,
_notmuch_message_close (message);
}
- notmuch_query_destroy (thread_id_query);
-
_resolve_thread_authors_string (thread);
_resolve_thread_relationships (thread);
+ /* Commit to returning thread. */
+ talloc_steal (ctx, thread);
+
+ DONE:
+ talloc_free (local);
return thread;
}
--
1.7.10.4
next prev parent reply other threads:[~2012-11-25 4:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-25 4:57 [PATCH 0/6] API for iterating over all messages in a thread Austin Clements
2012-11-25 4:57 ` Austin Clements [this message]
2013-02-19 1:13 ` [PATCH 1/6] lib: Clean up error handling in _notmuch_thread_create David Bremner
2013-02-19 1:16 ` David Bremner
2012-11-25 4:57 ` [PATCH 2/6] lib: Separate list of all messages from top-level messages Austin Clements
2012-11-25 4:57 ` [PATCH 3/6] lib: Eliminate _notmuch_message_list_append Austin Clements
2012-11-25 4:57 ` [PATCH 4/6] lib: Add an iterator over all messages in a thread Austin Clements
2012-11-25 4:57 ` [PATCH 5/6] python: Add bindings for notmuch_thread_get_messages Austin Clements
2013-05-04 18:51 ` David Bremner
2013-05-05 17:00 ` David Bremner
2012-11-25 4:57 ` [PATCH 6/6] ruby: " Austin Clements
2012-11-26 16:23 ` Ali Polatel
2012-11-25 14:31 ` [PATCH 0/6] API for iterating over all messages in a thread Mark Walters
2012-11-25 21:20 ` Austin Clements
2012-11-26 17:19 ` Tomi Ollila
2012-11-26 17:35 ` Austin Clements
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=1353819427-13182-2-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--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).