Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Vmaps: Fixed use after free and deadlocks when loading a model file fails

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d05dbaaecbd4bf7e1c0fd32d0fef34341b4067f6)
This commit is contained in:
Hondacrx
2024-08-31 18:44:32 -04:00
parent a9a28c889e
commit 8b991e1a06
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Collision/Management/VMapManager.cs
+14 -7
View File
@@ -183,13 +183,15 @@ namespace Game.Collision
public WorldModel AcquireModelInstance(string filename)
{
ManagedModel worldmodel; // this is intentionally declared before lock so that it is destroyed after it to prevent deadlocks in releaseModelInstance
lock (LoadedModelFilesLock)
{
filename = filename.TrimEnd('\0');
if (iLoadedModelFiles.TryGetValue(filename, out ManagedModel worldmodel))
if (iLoadedModelFiles.TryGetValue(filename, out worldmodel))
return worldmodel.Model;
var model = new ManagedModel();
var model = new ManagedModel(filename);
if (!model.Model.ReadFile(VMapPath + filename))
{
Log.outError(LogFilter.Server, $"VMapManager: could not load '{filename}'");
@@ -198,8 +200,6 @@ namespace Game.Collision
Log.outDebug(LogFilter.Maps, $"VMapManager: loading file '{filename}'");
worldmodel.Model.SetName(filename);
model = worldmodel;
iLoadedModelFiles.Add(filename, model);
@@ -212,14 +212,15 @@ namespace Game.Collision
lock (LoadedModelFilesLock)
{
filename = filename.TrimEnd('\0');
Log.outDebug(LogFilter.Maps, $"VMapManager: unloading file '{filename}'");
var erased = iLoadedModelFiles.Remove(filename);
if (!erased)
{
Log.outError(LogFilter.Server, $"VMapManager: trying to unload non-loaded file '{filename}'");
return;
}
Log.outDebug(LogFilter.Maps, $"VMapManager: unloading file '{filename}'");
}
}
@@ -271,10 +272,16 @@ namespace Game.Collision
public class ManagedModel
{
public WorldModel Model;
string _name; // valid only while model is held in VMapManager2::iLoadedModelFiles
public ManagedModel(string name)
{
_name = name;
}
~ManagedModel()
{
Global.VMapMgr.ReleaseModelInstance(Model.GetName());
Global.VMapMgr.ReleaseModelInstance(_name);
}
}