diff options
| author | David Bremner <david@tethera.net> | 2021-10-23 10:22:38 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-10-30 13:51:50 -0300 |
| commit | fe51c275fcd7107d92b40de511086300ba4060ed (patch) | |
| tree | a8070ebfb3eea9e6779960750463c0bf7d6991fc | |
| parent | 8f0b84789d4fda0182e073b68b73160c9b94a4b7 (diff) | |
lib/load_config: deallocate / NULL database on fatal error
This fixes a potential memory leak, and makes the behaviour of
notmuch_database_load_config (somewhat) consistent with
n_d_{open,create} with config.
| -rw-r--r-- | lib/open.cc | 7 | ||||
| -rwxr-xr-x | test/T590-libconfig.sh | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/open.cc b/lib/open.cc index 6fa00a84..ba32c2f1 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -871,6 +871,13 @@ notmuch_database_load_config (const char *database_path, if (status_string) *status_string = message; + if (status && + status != NOTMUCH_STATUS_NO_DATABASE + && status != NOTMUCH_STATUS_NO_CONFIG) { + notmuch_database_destroy (notmuch); + notmuch = NULL; + } + if (database) *database = notmuch; diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index b4abbd78..8db51ed0 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -942,7 +942,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "load_config: database set to NULL on fatal error" -test_subtest_known_broken cat c_head3 - c_tail3 <<'EOF' | test_C notmuch_status_t st = notmuch_database_load_config("relative", NULL, NULL, &db, NULL); EOF |