Prevent explicit NULL dereference

This commit is contained in:
twinaphex 2017-02-28 10:47:24 +01:00
parent 56eb09406b
commit ef1323bbfd

View File

@ -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]; 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; continue;
if (!string_list_find_elem(info->databases_list, database)) if (!string_is_empty(database) || !string_list_find_elem(info->databases_list, database))
continue; continue;
free(database); free(database);
return true; return true;
} }
free(database); if (!string_is_empty(database))
free(database);
return false; return false;
} }