oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix error-case leaks in lib/base/db.c

Browse Source
This commit is contained in:
Nicolas Williams
2015-03-19 09:29:33 -05:00
parent 2bbf56b2e4
commit 2fbd7331a6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/base/db.c
View File

@@ -1072,17 +1072,25 @@ db_replay_log(heim_db_t db, heim_error_t *error)
return 0; return 0;
ret = read_json(heim_string_get_utf8(journal_fname), &journal, error); ret = read_json(heim_string_get_utf8(journal_fname), &journal, error);
if (ret == ENOENT) if (ret == ENOENT) {
heim_release(journal_fname);
return 0; return 0;
if (ret == 0 && journal == NULL) }
if (ret == 0 && journal == NULL) {
heim_release(journal_fname);
return 0; return 0;
if (ret != 0) }
if (ret != 0) {
heim_release(journal_fname);
return ret; return ret;
}
if (heim_get_tid(journal) != HEIM_TID_ARRAY) if (heim_get_tid(journal) != HEIM_TID_ARRAY) {
heim_release(journal_fname);
return HEIM_ERROR(error, EINVAL, return HEIM_ERROR(error, EINVAL,
(ret, N_("Invalid journal contents; delete journal", (ret, N_("Invalid journal contents; delete journal",
""))); "")));
}
len = heim_array_get_length(journal); len = heim_array_get_length(journal);
@@ -1091,11 +1099,14 @@ db_replay_log(heim_db_t db, heim_error_t *error)
if (len > 1) if (len > 1)
db->del_keys = heim_array_get_value(journal, 1); db->del_keys = heim_array_get_value(journal, 1);
ret = db_do_log_actions(db, error); ret = db_do_log_actions(db, error);
if (ret) if (ret) {
heim_release(journal_fname);
return ret; return ret;
}
/* Truncate replay log and we're done */ /* Truncate replay log and we're done */
ret = open_file(heim_string_get_utf8(journal_fname), 1, 0, NULL, error); ret = open_file(heim_string_get_utf8(journal_fname), 1, 0, NULL, error);
heim_release(journal_fname);
if (ret) if (ret)
return ret; return ret;
heim_release(db->set_keys); heim_release(db->set_keys);