From 58f6ae0439a909a480c3fc7ba5efa504a3b1865b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 8 Sep 2010 16:14:19 +0200 Subject: add forgotten database disconnect on error path Signed-off-by: Denys Vlasenko --- src/daemon/MiddleWare.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 9f0f815b..777d110d 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -623,10 +623,9 @@ static bool is_debug_dump_saved(long uid, const char *debug_dump_dir) database->DisConnect(); bool found = false; - struct db_row *row = NULL; for (GList *li = table; li != NULL; li = g_list_next(li)) { - row = (struct db_row*)li->data; + struct db_row *row = (struct db_row*)li->data; if (0 == strcmp(row->db_dump_dir, debug_dump_dir)) { found = true; @@ -1137,13 +1136,12 @@ mw_result_t FillCrashInfo(const char *crash_id, { CDatabase* database = g_pPluginManager->GetDatabase(g_settings_sDatabase.c_str()); database->Connect(); - struct db_row *row = database->GetRow(crash_id); + database->DisConnect(); + if (!row) return MW_ERROR; - database->DisConnect(); - std::string package; std::string executable; std::string description; @@ -1181,10 +1179,9 @@ void GetUUIDsOfCrash(long caller_uid, vector_string_t &result) GList *rows = database->GetUIDData(caller_uid); database->DisConnect(); - struct db_row *row = NULL; for (GList *li = rows; li != NULL; li = g_list_next(li)) { - row = (struct db_row*)li->data; + struct db_row *row = (struct db_row*)li->data; string crash_id = ssprintf("%s:%s", row->db_uid, row->db_uuid); result.push_back(crash_id); } -- cgit