debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/create: fix memory leak, ensure *database=NULL on error

Browse source 
This code previously relied on _finish_open to free the notmuch struct
on errors (except for the case of database == NULL, which was a
potential double free). When we removed those frees from _finish_open,
we introduced a (small) memory leak.

In this commit, fix the memory leak, and harmonize the on-error
behaviour with n_d_open_with_config.
This commit is contained in:
David Bremner 2021-10-23 10:22:36 -03:00
parent f3fcdd2dda
commit 2ba50b5230
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/open.cc
View file

@ -714,10 +714,16 @@ notmuch_database_create_with_config (const char *database_path,
else else
free (message); free (message);
} }
if (status && notmuch) {
notmuch_database_destroy (notmuch);
notmuch = NULL;
}
if (database) if (database)
*database = notmuch; *database = notmuch;
else
talloc_free (notmuch); if (notmuch)
notmuch->open = true;
return status; return status;
} }

2
test/T590-libconfig.sh
View file

@ -891,7 +891,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "create: database set to null on missing config" test_begin_subtest "create: database set to null on missing config"
test_subtest_known_broken
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} "/nonexistent" cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} "/nonexistent"
notmuch_status_t st = notmuch_database_create_with_config(argv[1],argv[2], NULL, &db, NULL); notmuch_status_t st = notmuch_database_create_with_config(argv[1],argv[2], NULL, &db, NULL);
EOF EOF
@ -903,7 +902,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "create: database set to null on missing config (env)" test_begin_subtest "create: database set to null on missing config (env)"
test_subtest_known_broken
old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG} old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG}
NOTMUCH_CONFIG="/nonexistent" NOTMUCH_CONFIG="/nonexistent"
cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR} cat c_head3 - c_tail3 <<'EOF' | test_C ${MAIL_DIR}