debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-22 07:25:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source 
Merge in g_hash_table read-after-free fix
This commit is contained in:
David Bremner 2017-02-23 09:08:15 -04:00
commit e0e8586fc7
4 changed files with 5 additions and 5 deletions
bindings/python/notmuch
version.py
debian
changelog
lib
database.cc
version

2
bindings/python/notmuch/version.py
View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version
__VERSION__ = '0.23.5'
__VERSION__ = '0.23.6'
SOVERSION = '4'

2
debian/changelog vendored
View file

@ -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.

4
lib/database.cc
View file

@ -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

2
version
View file

@ -1 +1 @@
0.23.5
0.23.6