diff --git a/LightlessSync/Services/DalamudUtilService.cs b/LightlessSync/Services/DalamudUtilService.cs index 2606d7b..684c011 100644 --- a/LightlessSync/Services/DalamudUtilService.cs +++ b/LightlessSync/Services/DalamudUtilService.cs @@ -962,50 +962,68 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber { var gameObj = (GameObject*)address; - if (gameObj == null || gameObj->ObjectKind == 0) + if (gameObj == null) return; - if (!IsGameObjectPresent(address)) + if (!_objectTable.Any(o => o?.Address == address)) { - _logger.LogDebug("Character {name} at {addr} no longer present in object table", characterName, address.ToString("X")); + _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) { - isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000; + try + { + isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000; + } + catch (AccessViolationException) + { + return; + } + if (!isDrawing) { - var charBase = (CharacterBase*)drawObj; - if (charBase != null) + try { - isDrawing = charBase->HasModelInSlotLoaded != 0; - if (!isDrawing) + var charBase = (CharacterBase*)drawObj; + if (charBase != null) { - isDrawing = charBase->HasModelFilesInSlotLoaded != 0; - if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal) - && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal)) + isDrawing = charBase->HasModelInSlotLoaded != 0; + if (!isDrawing) { - _lastGlobalBlockPlayer = characterName; - _lastGlobalBlockReason = "HasModelFilesInSlotLoaded"; - isDrawingChanged = true; - } - } - else - { - if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal) - && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal)) - { - _lastGlobalBlockPlayer = characterName; - _lastGlobalBlockReason = "HasModelInSlotLoaded"; - isDrawingChanged = true; + isDrawing = charBase->HasModelFilesInSlotLoaded != 0; + if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal) + && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal)) + { + _lastGlobalBlockPlayer = characterName; + _lastGlobalBlockReason = "HasModelFilesInSlotLoaded"; + isDrawingChanged = true; + } + } + else + { + if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal) + && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal)) + { + _lastGlobalBlockPlayer = characterName; + _lastGlobalBlockReason = "HasModelInSlotLoaded"; + isDrawingChanged = true; + } } } } + catch (AccessViolationException) + { + return; + } } else { @@ -1028,7 +1046,11 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber } catch (AccessViolationException ex) { - _logger.LogWarning(ex, "access violation checking character {name} at {addr}", characterName, address.ToString("X")); + _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")); } } @@ -1057,51 +1079,79 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber _actorObjectService.RefreshTrackedActors(); } + // CRITICAL: Capture snapshot once to prevent mid-iteration changes var playerDescriptors = _actorObjectService.PlayerDescriptors; - for (var i = 0; i < playerDescriptors.Count; i++) + var descriptorCount = playerDescriptors.Count; + + for (var i = 0; i < descriptorCount; i++) { - var actor = playerDescriptors[i]; - - var playerAddress = actor.Address; - if (playerAddress == nint.Zero) - continue; - - if (actor.ObjectIndex >= 200) - continue; - - if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime) + try { - _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X")); - continue; - } + // Revalidate the count in case collection changed + if (i >= playerDescriptors.Count) + break; - if (!IsAnythingDrawing) - { - try + var actor = playerDescriptors[i]; + + var playerAddress = actor.Address; + if (playerAddress == nint.Zero) + continue; + + if (actor.ObjectIndex >= 200) + continue; + + if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime) { - var gameObj = (GameObject*)playerAddress; - - if (gameObj == null || gameObj->ObjectKind == 0) - { - continue; - } - - var currentName = gameObj->NameString ?? string.Empty; - var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName; - - CheckCharacterForDrawing(playerAddress, charaName); - - if (IsAnythingDrawing) - break; - } - catch (AccessViolationException ex) - { - _logger.LogWarning(ex, "Memory access violation reading character at {addr}", playerAddress.ToString("X")); + _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X")); continue; } + + if (!IsAnythingDrawing) + { + // Wrap ALL pointer access in try-catch + try + { + var gameObj = (GameObject*)playerAddress; + + if (gameObj == null || gameObj->ObjectKind == 0) + { + continue; + } + + // Get name with protection - NameString internally dereferences pointers + string currentName; + try + { + currentName = gameObj->NameString ?? string.Empty; + } + catch (AccessViolationException) + { + currentName = string.Empty; + } + + var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName; + + CheckCharacterForDrawing(playerAddress, charaName); + + if (IsAnythingDrawing) + break; + } + catch (AccessViolationException ex) + { + _logger.LogDebug(ex, "Access violation on GameObject pointer for actor {index} at {addr}", i, playerAddress.ToString("X")); + } + } + } + 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)) {