From: Carl Worth <cworth@cworth.org>
Date: Tue, 1 Dec 2009 20:40:13 +0000 (-0800)
Subject: lib/index: Fix memory leak for email addresses without names.
X-Git-Tag: 0.1~268
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5316b320a51915fc1dbdd8724643931cd03327f;p=notmuch.git

lib/index: Fix memory leak for email addresses without names.

We carefully noted the fact that we had locally allocated the string
here, but then we neglected to free it. Switch to talloc instead
which makes it easier to get the behavior we want. It's simpler since
we can just call talloc_free unconditionally, without having to track
the state of whether we allocated the storage for name or not.
---

diff --git a/lib/index.cc b/lib/index.cc
index 80df64bf..125fa6c9 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -31,7 +31,7 @@ _index_address_mailbox (notmuch_message_t *message,
 {
     InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
     const char *name, *addr;
-    int own_name = 0;
+    void *local = talloc_new (NULL);
 
     name = internet_address_get_name (address);
     addr = internet_address_mailbox_get_addr (mailbox);
@@ -42,16 +42,16 @@ _index_address_mailbox (notmuch_message_t *message,
 	const char *at;
 
 	at = strchr (addr, '@');
-	if (at) {
-	    name = strndup (addr, at - addr);
-	    own_name = 1;
-	}
+	if (at)
+	    name = talloc_strndup (local, addr, at - addr);
     }
 
     if (name)
 	_notmuch_message_gen_terms (message, prefix_name, name);
     if (addr)
 	_notmuch_message_gen_terms (message, prefix_name, addr);
+
+    talloc_free (local);
 }
 
 static void