mirror of
https://git.notmuchmail.org/git/notmuch
synced 2025-03-14 03:25:15 +01:00
Merge branch 'release'
Merge in g_hash_table read-after-free fix
This commit is contained in:
commit
e0e8586fc7
4 changed files with 5 additions and 5 deletions
|
@ -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
2
debian/changelog
vendored
|
@ -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.
|
||||
|
|
|
@ -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
2
version
|
@ -1 +1 @@
|
|||
0.23.5
|
||||
0.23.6
|
||||
|
|
Loading…
Add table
Reference in a new issue