Skip to content

Commit 6ddede9

Browse files
committed
[GEN][ZH] Prevent dereferencing NULL pointer 'TheAI' in AI::parseAiDataDefinition()
1 parent ef5fea1 commit 6ddede9

File tree

2 files changed

+6
-8
lines changed
  • Generals/Code/GameEngine/Source/GameLogic/AI
  • GeneralsMD/Code/GameEngine/Source/GameLogic/AI

2 files changed

+6
-8
lines changed

Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,10 @@ void AI::parseAiDataDefinition( INI* ini )
427427
if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
428428
TheAI->newOverride();
429429

430-
} // end if
431-
432-
// parse the ini weapon definition
433-
ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
430+
// parse the ini weapon definition
431+
ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
434432

433+
} // end if
435434
}
436435

437436

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,10 @@ void AI::parseAiDataDefinition( INI* ini )
430430
if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
431431
TheAI->newOverride();
432432

433-
} // end if
434-
435-
// parse the ini weapon definition
436-
ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
433+
// parse the ini weapon definition
434+
ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
437435

436+
} // end if
438437
}
439438

440439

0 commit comments

Comments
 (0)