debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-02-17 23:53:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '0.3.x' immediately after the 0.3.1 release

Browse source 
This brings one bug fix into master that was originally applied
directly to the 0.3.x branch.
This commit is contained in:
Carl Worth 2010-04-27 17:12:16 -07:00
commit 417274d698
4 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
NEWS
View file

@ -18,8 +18,8 @@ Automatically tag messages as "replied" when sending a reply
Notmuch 0.3.1 (2010-04-27) Notmuch 0.3.1 (2010-04-27)
========================== ==========================
General bug fix General bug fixes
--------------- -----------------
Fix an infinite loop in "notmuch reply" Fix an infinite loop in "notmuch reply"
This bug could be triggered by replying to a message where the This bug could be triggered by replying to a message where the
@ -27,6 +27,12 @@ Fix an infinite loop in "notmuch reply"
the user had not configured any secondary email addresses. The bug the user had not configured any secondary email addresses. The bug
was a simple re-use of the same iterator variable in nested loops. was a simple re-use of the same iterator variable in nested loops.
Fix a potential SEGV in "notmuch search"
This bug could be triggered by an author name ending in a ','.
Admittedly - that's almost certainly a spam email, but we never
want notmuch to crash.
Emacs bug fixes Emacs bug fixes
--------------- ---------------
Fix calculations for line wrapping in the primary "notmuch" view. Fix calculations for line wrapping in the primary "notmuch" view.

9
debian/changelog vendored
View file

@ -1,3 +1,12 @@
notmuch (0.3.1) unstable; urgency=low
* Fix an infinite loop in "notmuch reply"
* Fix a potential SEGV in "notmuch search"
* emacs: Fix calculations for line wrapping in the "notmuch" view.
* emacs: Fix Fcc support to prompt to create a directory if necessary
-- Carl Worth <cworth@debian.org> Tue, 27 Apr 2010 17:02:07 -0700
notmuch (0.3) unstable; urgency=low notmuch (0.3) unstable; urgency=low
* User-configurable tags for new messages * User-configurable tags for new messages

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;
} }

2
version
View file

@ -1 +1 @@
0.3 0.3.1