Fixed memory-leaking on server-side

ERAGON007 · Jul 3, 2021 · 696cd31 · 696cd31
1 parent 5a3e7f2
commit 696cd31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/c_modelsLoader.lua b/c_modelsLoader.lua
@@ -32,10 +32,9 @@ local function loadAllModels()
     for _, modelObject in ipairs(_MODELS) do
         if (modelObject.dontCache) then
             triggerServerEvent("modelLoader:getModelFiles", resourceRoot, localPlayer, _)
-            return
+        else
+            loadOneModel(modelObject.txdFileName, modelObject.dffFileName, modelObject.objectId, modelObject.colFileName)
         end
-
-        loadOneModel(modelObject.txdFileName, modelObject.dffFileName, modelObject.objectId, modelObject.colFileName)
     end
 end
 

diff --git a/s_modelsHandler.lua b/s_modelsHandler.lua
@@ -13,11 +13,20 @@ function(thePlayer, modelIndex)
         if not(txdFile and dffFile) then outputDebugString("couldn't load txd or dff file for " .. _MODELS[modelIndex].txdFileName .. " and " .. _MODELS[modelIndex].dffFileName, 1, 255, 0, 0) return end
 
         local colFile
+        local col
         if (_MODELS[modelIndex].colFileName) then
-            colFile = fileOpen("Models/" .. _MODELS[modelIndex].colFileName, true)
+            local col = fileOpen("Models/" .. _MODELS[modelIndex].colFileName, true)
+            colFile = fileRead(col, fileGetSize(col))
         end
 
-        triggerClientEvent(thePlayer, "modelLoader:loadOneModel", resourceRoot, txdFile, dffFile, _MODELS[modelIndex].objectId, colFile)
+        triggerClientEvent(thePlayer, "modelLoader:loadOneModel", resourceRoot, fileRead(txdFile, fileGetSize(txdFile)), fileRead(dffFile, fileGetSize(dffFile)), _MODELS[modelIndex].objectId, colFile)
+
+        fileClose(txdFile)
+        fileClose(dffFile)
+
+        if (col) then
+            fileClose(col)
+        end
     else
         outputDebugString("invalid arguments given for 'modelLoader:getModelFiles' Event (server-side)", 1, 255, 0, 0)
     end