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
unsigned int directory_id;
const char *direntry, *directory;
char *colon;
unsigned int directory_id;
const char *direntry, *directory;
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;
/* Indicate that there are filenames remaining. */
status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
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);
direntry += direntry_prefix_len;
directory_id = strtol (direntry, &colon, 10);