From a71d4b70ff8329878967652b131ce811ad699aa6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 7 Apr 2018 22:20:30 +0200 Subject: [PATCH] Add missing fclose --- src/common/Collision/Maps/TileAssembler.cpp | 3 +++ src/common/Collision/Models/GameObjectModel.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index c57d19baf32..e9203ca7378 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -355,7 +355,10 @@ namespace VMAP char ident[8]; if (fread(ident, 1, 8, model_list) != 8 || memcmp(ident, VMAP::RAW_VMAP_MAGIC, 8) != 0) + { + fclose(model_list); return; + } FILE* model_list_copy = fopen((iDestDir + "/" + GAMEOBJECT_MODELS).c_str(), "wb"); if (!model_list_copy) diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 846b98ef837..22de17e1ad0 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -58,6 +58,7 @@ void LoadGameObjectModelList(std::string const& dataPath) || memcmp(magic, VMAP::VMAP_MAGIC, 8) != 0) { TC_LOG_ERROR("misc", "File '%s' has wrong header, expected %s.", VMAP::GAMEOBJECT_MODELS, VMAP::VMAP_MAGIC); + fclose(model_list_file); return; }