Fix engineGetModelTextures memory leak (#1704)

Co-authored-by: Qais Patankar <[email protected]>
multitheftauto · Oct 11, 2020 · d9ee1af · d9ee1af
1 parent 4c066c3
commit d9ee1af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Client/core/CCredits.cpp b/Client/core/CCredits.cpp
@@ -182,6 +182,7 @@ CCredits::CCredits()
         "pentaflops\n"
         "knitz12\n"
         "ApeLsiN4eG\n"
+        "theSarrum\n"
         "AlιAѕѕaѕѕιN\n"
         "PerikiyoXD\n"
         "correaAlex\n"

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
@@ -1126,11 +1126,18 @@ int CLuaEngineDefs::EngineGetModelTextures(lua_State* luaVM)
     if (argStream.HasErrors())
         return luaL_error(luaVM, argStream.GetFullErrorMessage());
 
+    CLuaMain*  pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+    CResource* pParentResource = pLuaMain->GetResource();
+
     lua_newtable(luaVM);
     for (const auto& pair : textureList)
     {
         CClientTexture* pTexture = g_pClientGame->GetManager()->GetRenderElementManager()->CreateTexture("", &std::get<1>(pair), RDEFAULT, RDEFAULT, RDEFAULT,
                                                                                                          RFORMAT_UNKNOWN, TADDRESS_WRAP);
+        if (pTexture)
+        {
+            pTexture->SetParent(pParentResource->GetResourceDynamicEntity());
+        }
         lua_pushstring(luaVM, std::get<0>(pair).c_str());
         lua_pushelement(luaVM, pTexture);
         lua_settable(luaVM, -3);