[FIXED] CTLD. Memory leak adding zones of the same name and type

[FIXED] CSAR. nil pointer

Moose Development/Moose/Ops/CSAR.lua

@@ -1150,11 +1150,11 @@ function CSAR:_EventHandler(EventData)
 
     local initdcscoord = nil
     local initcoord = nil
-    if _event.id == EVENTS.Ejection then
+    if _event.id == EVENTS.Ejection and _event.TgtDCSUnit then
       initdcscoord = _event.TgtDCSUnit:getPoint()
       initcoord = COORDINATE:NewFromVec3(initdcscoord)
       self:T({initdcscoord})
-    else
+    elseif _event.IniDCSUnit then
       initdcscoord = _event.IniDCSUnit:getPoint()
       initcoord = COORDINATE:NewFromVec3(initdcscoord)
       self:T({initdcscoord})

Moose Development/Moose/Ops/CTLD.lua

@@ -5671,7 +5671,13 @@ function CTLD:AddCTLDZone(Name, Type, Color, Active, HasBeacon, Shiplength, Ship
   end
   end
 
-  local ctldzone = {} -- #CTLD.CargoZone
+  local exists = true
+  local ctldzone = self:GetCTLDZone(Name, Type) -- #CTLD.CargoZone
+  if not ctldzone then
+    exists = false
+    ctldzone = {}
+  end
+
   ctldzone.active = Active or false
   ctldzone.color = Color or SMOKECOLOR.Red
   ctldzone.name = Name or "NONE"
@@ -5698,10 +5704,55 @@ function CTLD:AddCTLDZone(Name, Type, Color, Active, HasBeacon, Shiplength, Ship
    ctldzone.shipwidth = Shipwidth or 10
   end
 
-  self:AddZone(ctldzone)
+  if not exists then
+    self:AddZone(ctldzone)
+  end
   return self
 end
 
+
+--- User function - find #CTLD.CargoZone zone by name.
+-- @param #CTLD self
+-- @param #string Name Name of this zone.
+-- @param #string Type Type of this zone, #CTLD.CargoZoneType
+-- @return #CTLD.CargoZone self
+function CTLD:GetCTLDZone(Name, Type)
+
+  if Type == CTLD.CargoZoneType.LOAD then
+    for _, z in pairs(self.pickupZones) do
+        if z.name == Name then
+            return z
+        end
+    end
+  elseif Type == CTLD.CargoZoneType.DROP then
+    for _, z in pairs(self.dropOffZones) do
+        if z.name == Name then
+            return z
+        end
+    end
+  elseif Type == CTLD.CargoZoneType.SHIP then
+    for _, z in pairs(self.shipZones) do
+        if z.name == Name then
+            return z
+        end
+    end
+  elseif Type == CTLD.CargoZoneType.BEACON then
+    for _, z in pairs(self.droppedBeacons) do
+        if z.name == Name then
+            return z
+        end
+    end
+  else
+    for _, z in pairs(self.wpZones) do
+        if z.name == Name then
+            return z
+        end
+    end
+  end
+
+  return nil
+end
+
 --- User function - Creates and adds a #CTLD.CargoZone zone for this CTLD instance from an Airbase or FARP name.
 --  Zones of type LOAD: Players load crates and troops here.  
 --  Zones of type DROP: Players can drop crates here. Note that troops can be unloaded anywhere.