aboutsummaryrefslogtreecommitdiff
path: root/src/tools/vmap4_assembler/TileAssembler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-07-06 22:52:11 +0200
committerOvahlord <dreadkiller@gmx.de>2024-07-06 22:59:34 +0200
commit120bea629ddf1bea2fae340f3422b8b6e477a709 (patch)
tree6740eb9b56a22c827803f29600331c5632c6e613 /src/tools/vmap4_assembler/TileAssembler.cpp
parent0fe73dc2b6527b7f0088ac310679d1c9e9c630ff (diff)
Core/Vmaps: Fixed use after free and deadlocks when loading a model file fails
(cherry picked from commit d05dbaaecbd4bf7e1c0fd32d0fef34341b4067f6)
Diffstat (limited to 'src/tools/vmap4_assembler/TileAssembler.cpp')
-rw-r--r--src/tools/vmap4_assembler/TileAssembler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/vmap4_assembler/TileAssembler.cpp b/src/tools/vmap4_assembler/TileAssembler.cpp
index 162c1bad29e..2f96d3d4442 100644
--- a/src/tools/vmap4_assembler/TileAssembler.cpp
+++ b/src/tools/vmap4_assembler/TileAssembler.cpp
@@ -100,7 +100,6 @@ namespace VMAP
threadPool.PostWork([this, file = directoryEntry.path(), &abortThreads, &workerIndexGen, &spawnedModelFilesByThread, &mapsToProcess]
{
thread_local std::size_t workerIndex = workerIndexGen++;
- --mapsToProcess;
auto dirf = OpenFile(file, "rb");
if (!dirf)
@@ -127,6 +126,7 @@ namespace VMAP
return abortThreads();
spawnedModelFilesByThread[workerIndex].merge(data.SpawnedModelFiles);
+ --mapsToProcess;
});
}