1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check if pSoldier is null

Browse Source 
Prevent nullptr dereference in AI logging function
This commit is contained in:
Asdow
2024-01-28 11:16:41 +02:00
parent 5a74323d1f
commit 2697a17010
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/AIMain.cpp
+11 -17
View File
@@ -217,7 +217,7 @@ void DebugAI( INT8 bMsgType, SOLDIERTYPE *pSoldier, STR szOutput, INT8 bAction )
CHAR8 msg[1024]; CHAR8 msg[1024];
CHAR8 buf[1024]; CHAR8 buf[1024];
if (!gfLogsEnabled) if (!gfLogsEnabled || pSoldier == nullptr)
return; return;
memset(buf, 0, 1024 * sizeof(char)); memset(buf, 0, 1024 * sizeof(char));
@@ -235,17 +235,14 @@ void DebugAI( INT8 bMsgType, SOLDIERTYPE *pSoldier, STR szOutput, INT8 bAction )
sprintf(msg, ""); sprintf(msg, "");
if (pSoldier) sprintf(buf, "[%d] (%d)", pSoldier->ubID, pSoldier->sGridNo);
{ strcat(msg, buf);
sprintf(buf, "[%d] (%d)", pSoldier->ubID, pSoldier->sGridNo);
strcat(msg, buf);
if (pSoldier->ubProfile != NO_PROFILE) if (pSoldier->ubProfile != NO_PROFILE)
{ {
wcstombs(buf, pSoldier->GetName(), 1024 - 1); wcstombs(buf, pSoldier->GetName(), 1024 - 1);
strcat(msg, " "); strcat(msg, " ");
strcat(msg, buf); strcat(msg, buf);
}
} }
strcat(msg, " "); strcat(msg, " ");
@@ -266,13 +263,10 @@ void DebugAI( INT8 bMsgType, SOLDIERTYPE *pSoldier, STR szOutput, INT8 bAction )
strcat(msg, " "); strcat(msg, " ");
strcat(msg, szAction[bAction]); strcat(msg, szAction[bAction]);
if (pSoldier) sprintf(buf, " %d", pSoldier->aiData.usActionData);
{ strcat(msg, buf);
sprintf(buf, " %d", pSoldier->aiData.usActionData);
strcat(msg, buf);
}
if (pSoldier && pSoldier->aiData.bNextAction != AI_ACTION_NONE) if (pSoldier->aiData.bNextAction != AI_ACTION_NONE)
{ {
strcat(msg, " "); strcat(msg, " ");
strcat(msg, szAction[pSoldier->aiData.bNextAction]); strcat(msg, szAction[pSoldier->aiData.bNextAction]);