Merge branch '2.0.3' into dev

LightlessSync/Services/DalamudUtilService.cs

@@ -958,22 +958,48 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         if (address == nint.Zero)
             return;
 
+        try
+        {
             var gameObj = (GameObject*)address;
 
-        if (gameObj == null || gameObj->ObjectKind == 0)
+            if (gameObj == null)
                 return;
+
+            if (!_objectTable.Any(o => o?.Address == address))
+            {
+                _logger.LogDebug("Character {name} at {addr} no longer in object table", characterName, address.ToString("X"));
+                return;
+            }
+
+            if (gameObj->ObjectKind == 0)
+                return;
+
             var drawObj = gameObj->DrawObject;
             bool isDrawing = false;
             bool isDrawingChanged = false;
+
             if ((nint)drawObj != IntPtr.Zero)
+            {
+                try
                 {
                     isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
+                }
+                catch (AccessViolationException)
+                {
+                    return;
+                }
+
                 if (!isDrawing)
                 {
-                isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
+                    try
+                    {
+                        var charBase = (CharacterBase*)drawObj;
+                        if (charBase != null)
+                        {
+                            isDrawing = charBase->HasModelInSlotLoaded != 0;
                             if (!isDrawing)
                             {
-                    isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
+                                isDrawing = charBase->HasModelFilesInSlotLoaded != 0;
                                 if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
                                     && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
                                 {
@@ -993,6 +1019,12 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                                 }
                             }
                         }
+                    }
+                    catch (AccessViolationException)
+                    {
+                        return;
+                    }
+                }
                 else
                 {
                     if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
@@ -1012,6 +1044,15 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
             IsAnythingDrawing |= isDrawing;
         }
+        catch (AccessViolationException ex)
+        {
+            _logger.LogDebug(ex, "Memory access violation checking character {name} at {addr}", characterName, address.ToString("X"));
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Unexpected error checking character {name} at {addr}", characterName, address.ToString("X"));
+        }
+    }
 
     private void FrameworkOnUpdate(IFramework framework)
     {
@@ -1039,8 +1080,15 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                     }
 
                     var playerDescriptors = _actorObjectService.PlayerDescriptors;
-                    for (var i = 0; i < playerDescriptors.Count; i++)
+                    var descriptorCount = playerDescriptors.Count;
+
+                    for (var i = 0; i < descriptorCount; i++)
                     {
+                        try
+                        {
+                            if (i >= playerDescriptors.Count)
+                                break;
+
                             var actor = playerDescriptors[i];
 
                             var playerAddress = actor.Address;
@@ -1067,7 +1115,16 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                                         continue;
                                     }
 
-                                var currentName = gameObj->NameString ?? string.Empty;
+                                    string currentName;
+                                    try
+                                    {
+                                        currentName = gameObj->NameString ?? string.Empty;
+                                    }
+                                    catch (AccessViolationException)
+                                    {
+                                        currentName = string.Empty;
+                                    }
+
                                     var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName;
 
                                     CheckCharacterForDrawing(playerAddress, charaName);
@@ -1077,11 +1134,19 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                                 }
                                 catch (AccessViolationException ex)
                                 {
-                                _logger.LogWarning(ex, "Memory access violation reading character at {addr}", playerAddress.ToString("X"));
+                                    _logger.LogDebug(ex, "Access violation on GameObject pointer for actor {index} at {addr}", i, playerAddress.ToString("X"));
-                                continue;
                                 }
                             }
                         }
+                        catch (AccessViolationException ex)
+                        {
+                            _logger.LogDebug(ex, "Access violation processing actor {index} - object likely destroyed", i);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.LogWarning(ex, "Unexpected error processing actor {index}", i);
+                        }
+                    }
              });
 
             if (!IsAnythingDrawing && !string.IsNullOrEmpty(_lastGlobalBlockPlayer))