diff options
| author | David Bremner <david@tethera.net> | 2017-02-23 09:08:15 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-02-23 09:08:15 -0400 |
| commit | e0e8586fc72763571f9eafeb831c7bc79a15273d (patch) | |
| tree | 70fc4d756b58c9b4b570741c52520c47cf96895b | |
| parent | 2c5eed16b3b0bff9b6f488d3949ebdb62e8d1c35 (diff) | |
| parent | 48253190adb70fcc1783beeeb386c19ff4832fa9 (diff) | |
Merge branch 'release'
Merge in g_hash_table read-after-free fix
| -rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | lib/database.cc | 4 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 1397fefd..8d700260 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.23.5' +__VERSION__ = '0.23.6' SOVERSION = '4' diff --git a/debian/changelog b/debian/changelog index ccce50e1..9e7868f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -notmuch (0.23.5-2) UNRELEASED; urgency=medium +notmuch (0.23.6-1) UNRELEASED; urgency=medium * Use gpgconf --create-socketdir to create gpg-agent sockets for test suite. diff --git a/lib/database.cc b/lib/database.cc index 8016c4df..386dcd17 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -644,7 +644,7 @@ parse_references (void *ctx, ref = _parse_message_id (ctx, refs, &refs); if (ref && strcmp (ref, message_id)) { - g_hash_table_insert (hash, ref, NULL); + g_hash_table_add (hash, ref); last_ref = ref; } } @@ -653,7 +653,7 @@ parse_references (void *ctx, * reference to the database. We should avoid making a message * its own parent, thus the above check. */ - return last_ref; + return talloc_strdup(ctx, last_ref); } notmuch_status_t @@ -1 +1 @@ -0.23.5 +0.23.6 |