From 514a0a6a3bd74c03db6cd9b28edc0a29a8a2441e Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 23 Sep 2016 06:33:19 -0300 Subject: [PATCH] lib: add talloc reference from string map iterator to map This is needed so that when the map is modified during traversal, and thus unlinked by the database code, the map is not disposed of until the iterator is done with it. --- lib/string-map.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/string-map.c b/lib/string-map.c index 591ff6d5..0bb77e93 100644 --- a/lib/string-map.c +++ b/lib/string-map.c @@ -170,6 +170,9 @@ _notmuch_string_map_iterator_create (notmuch_string_map_t *map, const char *key, if (unlikely (iter == NULL)) return NULL; + if (unlikely (talloc_reference (iter, map) == NULL)) + return NULL; + iter->key = talloc_strdup (iter, key); iter->exact = exact; iter->current = bsearch_first (map->pairs, map->length, key, exact);