aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-04-07 22:20:30 +0200
committerjackpoz <giacomopoz@gmail.com>2019-04-02 19:53:05 +0200
commitdaf9e1be03f6466a5593ebeb61263c2f29f93ee3 (patch)
tree5e47ac1149d10d671c4ddacc02cf67f3d1579bc2 /src
parent5c082064da59227c08271508a5f2ce71e66da0d6 (diff)
Add missing fclose
(cherry picked from commit a71d4b70ff8329878967652b131ce811ad699aa6)
Diffstat (limited to 'src')
-rw-r--r--src/common/Collision/Maps/TileAssembler.cpp3
-rw-r--r--src/common/Collision/Models/GameObjectModel.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index 48985810d23..40635716da5 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
@@ -353,7 +353,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 ffe0636176b..96320ba42c0 100644
--- a/src/common/Collision/Models/GameObjectModel.cpp
+++ b/src/common/Collision/Models/GameObjectModel.cpp
@@ -59,6 +59,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;
}