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

Fix SEGV in _thread_cleanup_author if author ends with ', '

Browse source 
Admittedly, an author name ending in ',' guarantees this is spam, and
indeed this was triggered by a spam email, but that doesn't mean we
shouldn't handle this case correctly.
We now check that there is actually a component of the name (presumably
the first name) after the comma in the author name.

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
This commit is contained in:
Dirk Hohndel 2010-04-27 16:29:22 -07:00 committed by Carl Worth
parent 2baa5769a3
commit a258cb32b3
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/thread.cc
View file

@ -156,11 +156,19 @@ _thread_cleanup_author (notmuch_thread_t *thread,
char *blank; char *blank;
int fname,lname; int fname,lname;
if (author == NULL)
return NULL;
clean_author = talloc_strdup(thread, author); clean_author = talloc_strdup(thread, author);
if (clean_author == NULL) if (clean_author == NULL)
return NULL; return NULL;
/* check if there's a comma in the name and that there's a
* component of the name behind it (so the name doesn't end with
* the comma - in which case the string that strchr finds is just
* one character long ",\0").
* Otherwise just return the copy of the original author name that
* we just made*/
comma = strchr(author,','); comma = strchr(author,',');
if (comma) { if (comma && strlen(comma) > 1) {
/* let's assemble what we think is the correct name */ /* let's assemble what we think is the correct name */
lname = comma - author; lname = comma - author;
fname = strlen(author) - lname - 2; fname = strlen(author) - lname - 2;
@ -180,7 +188,6 @@ _thread_cleanup_author (notmuch_thread_t *thread,
/* we didn't identify this as part of the email address /* we didn't identify this as part of the email address
* so let's punt and return the original author */ * so let's punt and return the original author */
strcpy (clean_author, author); strcpy (clean_author, author);
} }
return clean_author; return clean_author;
} }