From 25594c5a8e18aa48ff0618a596ba3f0f04d846af Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 16 Feb 2019 17:37:16 +0100 Subject: Core/Misc: Fix static analysis issues Fix static analysis issues reported by Coverity --- src/common/Collision/Maps/MapTree.cpp | 3 +++ src/common/Collision/Models/WorldModel.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index 126f463d42c..c0ec1d151ac 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -276,7 +276,10 @@ namespace VMAP } FILE* tf = OpenMapTileFile(basePath, mapID, tileX, tileY, vm).File; if (!tf) + { + fclose(rf); return LoadResult::FileNotFound; + } else { std::string tilefile = basePath + getTileFileName(mapID, tileX, tileY); diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h index 8913a8358f9..f6d0b3c8fdc 100644 --- a/src/common/Collision/Models/WorldModel.h +++ b/src/common/Collision/Models/WorldModel.h @@ -107,7 +107,7 @@ namespace VMAP class TC_COMMON_API WorldModel { public: - WorldModel(): RootWMOID(0) { } + WorldModel(): Flags(0), RootWMOID(0) { } //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry! void setGroupModels(std::vector &models); -- cgit v1.2.3