1 files changed, 23 insertions, 12 deletions

diff --git a/src/modules.cpp b/src/modules.cpp
index b832694..7a82028 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1,8 +1,11 @@
 // modules.cpp — /proc/self/maps parsing and module discovery
 #include "hl2h.h"
 #include <elf.h>
+#include <mutex>
 #include <vector>
 
+static std::mutex g_modules_mutex;
+
 static bool basename_is(const char *path, const char *base) {
   size_t pl = strlen(path), bl = strlen(base);
   if (pl < bl || strcmp(path + pl - bl, base) != 0)
@@ -11,9 +14,7 @@ static bool basename_is(const char *path, const char *base) {
 }
 
 void find_modules() {
-  g_client = Module();
-  g_engine = Module();
-  g_server = Module();
+  Module client, engine, server;
   FILE *f = fopen("/proc/self/maps", "r");
   if (!f)
     return;
@@ -41,19 +42,19 @@ void find_modules() {
       memcpy(clean, path, pl);
       clean[pl] = 0;
       if (basename_is(clean, "client.so"))
-        m = &g_client;
+        m = &client;
       else if (basename_is(clean, "engine.so"))
-        m = &g_engine;
+        m = &engine;
       else if (basename_is(clean, "server.so"))
-        m = &g_server;
+        m = &server;
     } else {
       // anon: absorb only as .bss tail after a file-backed range
-      if (g_client.valid() && g_client.ranges.back().file &&
-          lo == g_client.ranges.back().hi && hi - lo <= 0x1000000)
-        m = &g_client;
-      else if (g_engine.valid() && g_engine.ranges.back().file &&
-               lo == g_engine.ranges.back().hi && hi - lo <= 0x1000000)
-        m = &g_engine;
+      if (client.valid() && client.ranges.back().file &&
+          lo == client.ranges.back().hi && hi - lo <= 0x1000000)
+        m = &client;
+      else if (engine.valid() && engine.ranges.back().file &&
+               lo == engine.ranges.back().hi && hi - lo <= 0x1000000)
+        m = &engine;
     }
     if (!m)
       continue;
@@ -71,6 +72,16 @@ void find_modules() {
     }
   }
   fclose(f);
+  // setup_thread and resolve_server_netvars can both call this; the old code
+  // reset the shared Module globals and reallocated their vectors live, which
+  // crashed under the startup thread. Publish complete snapshots instead.
+  std::lock_guard<std::mutex> lock(g_modules_mutex);
+  if (client.valid())
+    g_client = std::move(client);
+  if (engine.valid())
+    g_engine = std::move(engine);
+  if (server.valid())
+    g_server = std::move(server);
 }
 
 // ---------------------------------------------------------------------------