diff options
author | Kazuo Teramoto <kaz.rag@gmail.com> | 2011-12-31 02:37:41 -0200 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2011-12-31 23:08:15 -0400 |
commit | 442d405ad301bd0bc9dc1d385c21f943ba743308 (patch) | |
tree | f0b84fe8afff65a90dda76152645d85b16bde5d2 /lib | |
parent | 7da6733e890b913281afd5061cf5a648094a1eb4 (diff) |
lib: call g_mime_init() from notmuch_database_open()
As reported in
id:"CAEbOPGyuHnz4BPtDutnTPUHcP3eYcRCRkXhYoJR43RUMw671+g@mail.gmail.com"
sometimes gmime tries to access a NULL pointer, e.g. g_mime_iconv_open()
tries to access iconv_cache that is NULL if g_mime_init() is not called.
This causes notmuch to segfault when calling gmime functions.
Calling g_mime_init() initializes iconv_cache and others variables needed
by gmime, making sure they are initialized when notmuch calls gmime
functions.
Test marked fix by db.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/database.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/database.cc b/lib/database.cc index d11dfaf3..8103bd96 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -28,6 +28,8 @@ #include <glib.h> /* g_free, GPtrArray, GHashTable */ #include <glib-object.h> /* g_type_init */ +#include <gmime/gmime.h> /* g_mime_init */ + using namespace std; #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) @@ -585,6 +587,7 @@ notmuch_database_open (const char *path, struct stat st; int err; unsigned int i, version; + static int initialized = 0; if (asprintf (¬much_path, "%s/%s", path, ".notmuch") == -1) { notmuch_path = NULL; @@ -608,6 +611,12 @@ notmuch_database_open (const char *path, /* Initialize the GLib type system and threads */ g_type_init (); + /* Initialize gmime */ + if (! initialized) { + g_mime_init (0); + initialized = 1; + } + notmuch = talloc (NULL, notmuch_database_t); notmuch->exception_reported = FALSE; notmuch->path = talloc_strdup (notmuch, path); |