From d05dbaaecbd4bf7e1c0fd32d0fef34341b4067f6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 6 Jul 2024 22:52:11 +0200 Subject: Core/Vmaps: Fixed use after free and deadlocks when loading a model file fails --- src/common/Collision/Models/WorldModel.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/common/Collision/Models') diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h index 0958e9c308a..5e6d2a8a2fb 100644 --- a/src/common/Collision/Models/WorldModel.h +++ b/src/common/Collision/Models/WorldModel.h @@ -117,7 +117,7 @@ namespace VMAP class TC_COMMON_API WorldModel { public: - WorldModel(): Flags(ModelFlags::None), RootWMOID(0), name(nullptr) { } + WorldModel(): Flags(ModelFlags::None), RootWMOID(0) { } //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry! void setGroupModels(std::vector &models); @@ -129,14 +129,11 @@ namespace VMAP bool readFile(const std::string &filename); bool IsM2() const { return Flags.HasFlag(ModelFlags::IsM2); } std::vector const& getGroupModels() const { return groupModels; } - std::string const& GetName() const { return *name; } - void SetName(std::string const* newName) { name = newName; } protected: EnumFlag Flags; uint32 RootWMOID; std::vector groupModels; BIH groupTree; - std::string const* name; // valid only while model is held in VMapManager2::iLoadedModelFiles }; } // namespace VMAP -- cgit v1.2.3