From ef1323bbfdff0a02031221f6c662a4eeea74cea1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 28 Feb 2017 10:47:24 +0100 Subject: [PATCH] Prevent explicit NULL dereference --- core_info.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core_info.c b/core_info.c index c8b35577b4..3d56bb7009 100644 --- a/core_info.c +++ b/core_info.c @@ -874,17 +874,19 @@ bool core_info_database_supports_content_path(const char *database_path, const c { const core_info_t *info = &core_info_curr_list->list[i]; - if (!string_list_find_elem(info->supported_extensions_list, path_get_extension(path))) + if (!info || !string_list_find_elem(info->supported_extensions_list, path_get_extension(path))) continue; - if (!string_list_find_elem(info->databases_list, database)) + if (!string_is_empty(database) || !string_list_find_elem(info->databases_list, database)) continue; free(database); return true; } - free(database); + if (!string_is_empty(database)) + free(database); + return false; }