debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-29 06:04:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Carl Worth 2009-12-01 12:40:13 -08:00
parent 6320695223
commit e5316b320a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/index.cc
View file

@ -31,7 +31,7 @@ _index_address_mailbox (notmuch_message_t *message,
{ {
InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address); InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
const char *name, *addr; const char *name, *addr;
int own_name = 0; void *local = talloc_new (NULL);
name = internet_address_get_name (address); name = internet_address_get_name (address);
addr = internet_address_mailbox_get_addr (mailbox); addr = internet_address_mailbox_get_addr (mailbox);
@ -42,16 +42,16 @@ _index_address_mailbox (notmuch_message_t *message,
const char *at; const char *at;
at = strchr (addr, '@'); at = strchr (addr, '@');
if (at) { if (at)
name = strndup (addr, at - addr); name = talloc_strndup (local, addr, at - addr);
own_name = 1;
}
} }
if (name) if (name)
_notmuch_message_gen_terms (message, prefix_name, name); _notmuch_message_gen_terms (message, prefix_name, name);
if (addr) if (addr)
_notmuch_message_gen_terms (message, prefix_name, addr); _notmuch_message_gen_terms (message, prefix_name, addr);
talloc_free (local);
} }
static void static void