Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 3 Actions Packages Projects Releases 57 Wiki Activity

Adding memory violations catches and null checks to NameString and GameObj

Browse Source
This commit is contained in:
defnotken
2026-01-05 14:48:14 -06:00
parent 8e08da7471
commit a2ed9f8d2b
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
LightlessSync/Services/DalamudUtilService.cs
View File

@@ -955,7 +955,13 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
private unsafe void CheckCharacterForDrawing(nint address, string characterName) private unsafe void CheckCharacterForDrawing(nint address, string characterName)
{ {
if (address == nint.Zero)
return;
var gameObj = (GameObject*)address; var gameObj = (GameObject*)address;
if (gameObj == null || gameObj->ObjectKind == 0)
return;
var drawObj = gameObj->DrawObject; var drawObj = gameObj->DrawObject;
bool isDrawing = false; bool isDrawing = false;
bool isDrawingChanged = false; bool isDrawingChanged = false;
@@ -1052,16 +1058,28 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
if (!IsAnythingDrawing) if (!IsAnythingDrawing)
{ {
var gameObj = (GameObject*)playerAddress; try
var currentName = gameObj != null ? gameObj->NameString ?? string.Empty : string.Empty; {
var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName; var gameObj = (GameObject*)playerAddress;
CheckCharacterForDrawing(playerAddress, charaName);
if (IsAnythingDrawing) if (gameObj == null || gameObj->ObjectKind == 0)
break; {
} continue;
else }
{
break; 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"));
continue;
}
} }
} }
}); });