notmuch release 0.29.3-1 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAl3eb60ACgkQA0U5G1Wq
 FSE1Ug//Wxc7AYeHc9ErjBOkK/oQjagGOI6cKsovHfyHDRqVULsDfGt/at7wBuS2
 7V1sfU5zttoNmltmamkao4T+f/dH70D5UJxWXu1vM0QDnKz+1U4g5jTGV9sDbqwA
 34XtewzZ4508GjmmhhCHLkwQN1zplI1phGfhkwDCWrWc5er8Yat9EroHvgJ2GYcA
 fvMe13hODPC4/R5jPyKHKERyFrcj5oeZPOAV6pnaNKq1qeNgOpKm1usldl73rqe5
 ehrqF5ZgMr7wVjrnK/9wV4x4FTUKTgjweLzwQ3pWkYj3tzDx5KBBM47IrIKwoLh1
 /IS4PY9znohi/Nyl8IScmIeDAVj6PYITj0lqaDCL8x0vTkuZ5f8sFiJORZcmderk
 CylvJUahr/shdV1YolBsh1TfavP4eKIz77MkfO77uTyZACPIyZF0iHlV+me8ixIJ
 IDi2BJ0Sp+pky6/211iJtbf43CUnXATfr3COraLtT/xEKfENA63lvJRL4y+6ahmr
 BrGNfUZTvnY1+K9ym8dm3wfLe49TThMM+zbkY+2b25puO6u7cIFXgjBhhIwC4rdY
 bCd3RewBngge8NzvHw//k5+fd4s7b2BfA/6rLGWlEm4g6eik2IALtDU9Qm3L1twS
 RVr1yLoXICoJNLX7hZlgaF3iv+LzMrWkyKgjaLKiZ8HYnDwKXJg=
 =qUN/
 -----END PGP SIGNATURE-----

Merge tag 'debian/0.29.3-1'

notmuch release 0.29.3-1 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]
This commit is contained in:
David Bremner 2019-11-27 08:45:43 -04:00
commit dc2b5a031b
5 changed files with 32 additions and 4 deletions

15
NEWS
View file

@ -1,3 +1,18 @@
Notmuch 0.29.3 (2019-11-27)
===========================
General
-------
Fix for use-after-free in notmuch_config_list_{key,val}.
Fix for double close of file in notmuch-dump.
Debian
------
Drop python2 support from shipped debian packaging.
Notmuch 0.29.2 (2019-10-19) Notmuch 0.29.2 (2019-10-19)
=========================== ===========================

View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.29.2' __VERSION__ = '0.29.3'
SOVERSION = '5' SOVERSION = '5'

8
debian/changelog vendored
View file

@ -1,3 +1,11 @@
notmuch (0.29.3-1) unstable; urgency=medium
* New upstream bugfix release.
- fix use-after-free bug in libnotmuch
- fix double close of file in "notmuch dump"
-- David Bremner <bremner@debian.org> Wed, 27 Nov 2019 08:19:57 -0400
notmuch (0.29.2-2) experimental; urgency=medium notmuch (0.29.2-2) experimental; urgency=medium
* Drop python-notmuch binary package. * Drop python-notmuch binary package.

View file

@ -150,13 +150,17 @@ notmuch_config_list_valid (notmuch_config_list_t *metadata)
return true; return true;
} }
static inline char * _key_from_iterator (notmuch_config_list_t *list) {
return talloc_strdup (list, (*list->iterator).c_str () + CONFIG_PREFIX.length ());
}
const char * const char *
notmuch_config_list_key (notmuch_config_list_t *list) notmuch_config_list_key (notmuch_config_list_t *list)
{ {
if (list->current_key) if (list->current_key)
talloc_free (list->current_key); talloc_free (list->current_key);
list->current_key = talloc_strdup (list, (*list->iterator).c_str () + CONFIG_PREFIX.length ()); list->current_key = _key_from_iterator (list);
return list->current_key; return list->current_key;
} }
@ -166,7 +170,7 @@ notmuch_config_list_value (notmuch_config_list_t *list)
{ {
std::string strval; std::string strval;
notmuch_status_t status; notmuch_status_t status;
const char *key = notmuch_config_list_key (list); char *key = _key_from_iterator (list);
/* TODO: better error reporting?? */ /* TODO: better error reporting?? */
status = _metadata_value (list->notmuch, key, strval); status = _metadata_value (list->notmuch, key, strval);
@ -177,6 +181,7 @@ notmuch_config_list_value (notmuch_config_list_t *list)
talloc_free (list->current_val); talloc_free (list->current_val);
list->current_val = talloc_strdup (list, strval.c_str ()); list->current_val = talloc_strdup (list, strval.c_str ());
talloc_free (key);
return list->current_val; return list->current_val;
} }

View file

@ -1 +1 @@
0.29.2 0.29.3