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

lib: another iterator-temporary/stale-pointer bug

Browse source 
Tamas Szakaly points out [1] that the bug fixed in 51b073c still
exists in at least one place. This change follows the suggestion of
[2] and creates a block scope temporary std::string to avoid the rules
of iterators temporaries.

[1]: id:20141226113755.GA64154@pamparam
[2]: id:20141226230655.GA41992@pamparam
This commit is contained in:
David Bremner 2014-12-28 11:45:08 +01:00
parent 2dfbb7598b
commit 3d978a0d61
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/message.cc
View file

@ -641,15 +641,16 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)
unsigned int directory_id; unsigned int directory_id;
const char *direntry, *directory; const char *direntry, *directory;
char *colon; char *colon;
const std::string term = *i;
/* Terminate loop at first term without desired prefix. */ /* Terminate loop at first term without desired prefix. */
if (strncmp ((*i).c_str (), direntry_prefix, direntry_prefix_len)) if (strncmp (term.c_str (), direntry_prefix, direntry_prefix_len))
break; break;
/* Indicate that there are filenames remaining. */ /* Indicate that there are filenames remaining. */
status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
direntry = (*i).c_str (); direntry = term.c_str ();
direntry += direntry_prefix_len; direntry += direntry_prefix_len;
directory_id = strtol (direntry, &colon, 10); directory_id = strtol (direntry, &colon, 10);