diff options
| author | David Bremner <david@tethera.net> | 2014-12-28 11:45:08 +0100 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2015-01-02 17:10:37 +0100 |
| commit | 3d978a0d61df072de7e4fd52120f3448cf8e9df6 (patch) | |
| tree | 9c96795f4349e8840d51d4e1172f3fb75298f09d /lib/message.cc | |
| parent | 2dfbb7598b6869511c5d654221664bc9b2230413 (diff) | |
lib: another iterator-temporary/stale-pointer bug
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
Diffstat (limited to 'lib/message.cc')
| -rw-r--r-- | lib/message.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/message.cc b/lib/message.cc index a7a13cc2..bacb4d46 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -641,15 +641,16 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message) unsigned int directory_id; const char *direntry, *directory; char *colon; + const std::string term = *i; /* 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; /* Indicate that there are filenames remaining. */ status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; - direntry = (*i).c_str (); + direntry = term.c_str (); direntry += direntry_prefix_len; directory_id = strtol (direntry, &colon, 10); |