Skip to content

Fix critical bugs in FakeAircraftClass: division by zero, null derefs, and unreachable code #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix critical bugs in FakeAircraftClass: division by zero, null derefs, and unreachable code #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fca05a
Initial plan
Copilot Dec 9, 2025
34be3c1
Fix FakeAircraftClass bugs and add code quality improvements
Copilot Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 59 additions & 32 deletions src/Ext/Aircraft/Body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ int FakeAircraftClass::_Mission_Attack()
{
auto v13 = this->DistanceFrom(this->Destination);

if (v13 >= 512)
if (v13 >= AircraftConstants::MinDistanceForFacing)
{
auto v16 = this->Destination->GetCenterCoords();
CoordStruct v17;
Expand All @@ -122,21 +122,21 @@ int FakeAircraftClass::_Mission_Attack()

if (v17.X == v16.X && v17.Y == v16.Y) {
fac.Raw = 0;
} else {
auto v18 = std::atan2(double(v17.Y - v16.Y), double(v16.X - v17.X));
auto v19 = Math::DEG90_AS_RAD;
auto v20 = v18 - v19;
auto v21 = Math::BINARY_ANGLE_MAGIC;
fac.Raw = static_cast<unsigned short>(v20 * v21);
}

auto v18 = std::atan2(double(v17.Y - v16.Y), double(v16.X - v17.X));
auto v19 = Math::DEG90_AS_RAD;
auto v20 = v18 - v19;
auto v21 = Math::BINARY_ANGLE_MAGIC;
fac.Raw = unsigned short(v20 * v21);
this->SecondaryFacing.Set_Desired(fac);
return 1;
}
else
{
this->SecondaryFacing.Set_Desired(this->GetDirectionOverObject(this->Target));

if (v13 >= 16)
if (v13 >= AircraftConstants::MinDistanceToTarget)
{
return 1;
}
Expand Down Expand Up @@ -169,22 +169,24 @@ int FakeAircraftClass::_Mission_Attack()
this->SecondaryFacing.Set_Desired(this->GetDirectionOverObject(this->Target));
}

switch (this->GetFireError(this->Target, this->SelectWeapon(this->Target), true))
const int selectedWeapon = this->SelectWeapon(this->Target);

switch (this->GetFireError(this->Target, selectedWeapon, true))
{
case FireError::OK:
{
this->loseammo_6c8 = 1;

int v28 = 0;

if (this->GetWeapon(this->SelectWeapon(this->Target))->WeaponType->Burst > 0)
if (this->GetWeapon(selectedWeapon)->WeaponType->Burst > 0)
{
do
{
this->Fire(this->Target, this->SelectWeapon(this->Target));
this->Fire(this->Target, selectedWeapon);
++v28;
}
while (v28 < this->GetWeapon(this->SelectWeapon(this->Target))->WeaponType->Burst);
while (v28 < this->GetWeapon(selectedWeapon)->WeaponType->Burst);
}

MapClass::Instance->GetCellAt(this->Target->GetCoords())->ScatterContent(this->Location, true, false, false);
Expand Down Expand Up @@ -234,7 +236,7 @@ int FakeAircraftClass::_Mission_Attack()
AirAttackStatus::PickAttackLocation : AirAttackStatus::FireAtTarget);
}

return this->Is_Strafe() ? 1 : 45;
return this->Is_Strafe() ? 1 : AircraftConstants::FacingErrorTimeout;
}
case FireError::REARM:
return 1;
Expand Down Expand Up @@ -267,11 +269,13 @@ int FakeAircraftClass::_Mission_Attack()
this->PrimaryFacing.Set_Desired(this->GetDirectionOverObject(this->Target));
this->SecondaryFacing.Set_Desired(this->GetDirectionOverObject(this->Target));

switch (this->GetFireError(this->Target, this->SelectWeapon(this->Target), true))
const int selectedWeapon = this->SelectWeapon(this->Target);

switch (this->GetFireError(this->Target, selectedWeapon, true))
{
case FireError::OK:
{
this->Fire(this->Target, this->SelectWeapon(this->Target));
this->Fire(this->Target, selectedWeapon);
MapClass::Instance->GetCellAt(this->Target->GetCoords())->ScatterContent(this->Location, true, false, false);

if (!this->Ammo) {
Expand All @@ -296,7 +300,7 @@ int FakeAircraftClass::_Mission_Attack()
}

if (this->Is_Strafe()) {
return 45;
return AircraftConstants::FacingErrorTimeout;
}
}
return get_default_mission_control_return();
Expand Down Expand Up @@ -332,7 +336,9 @@ int FakeAircraftClass::_Mission_Attack()
{
if (this->Target)
{
switch (this->GetFireError(this->Target, this->SelectWeapon(this->Target), true))
const int selectedWeapon = this->SelectWeapon(this->Target);

switch (this->GetFireError(this->Target, selectedWeapon, true))
{
case FireError::OK:
case FireError::FACING:
Expand All @@ -349,7 +355,7 @@ int FakeAircraftClass::_Mission_Attack()
}
return 1;
}
this->Fire(this->Target, this->SelectWeapon(this->Target));
this->Fire(this->Target, selectedWeapon);
MapClass::Instance->GetCellAt(this->Target->GetCoords())->ScatterContent(this->Location, true, false, false);
this->SetDestination(this->Target, 1);
this->MissionStatus = (int)AirAttackStatus::FireAtTarget3_Strafe;
Expand All @@ -366,7 +372,9 @@ int FakeAircraftClass::_Mission_Attack()
{
if (this->Target)
{
switch (this->GetFireError(this->Target, this->SelectWeapon(this->Target), true))
const int selectedWeapon = this->SelectWeapon(this->Target);

switch (this->GetFireError(this->Target, selectedWeapon, true))
{
case FireError::OK:
case FireError::FACING:
Expand All @@ -384,7 +392,7 @@ int FakeAircraftClass::_Mission_Attack()
return 1;
}

this->Fire(this->Target, this->SelectWeapon(this->Target));
this->Fire(this->Target, selectedWeapon);
MapClass::Instance->GetCellAt(this->Target->GetCoords())->ScatterContent(this->Location, true, false, false);
this->SetDestination(this->Target, 1);
this->MissionStatus = (int)AirAttackStatus::FireAtTarget4_Strafe;
Expand All @@ -401,7 +409,9 @@ int FakeAircraftClass::_Mission_Attack()
{
if (this->Target)
{
switch (this->GetFireError(this->Target, this->SelectWeapon(this->Target), true))
const int selectedWeapon = this->SelectWeapon(this->Target);

switch (this->GetFireError(this->Target, selectedWeapon, true))
{
case FireError::OK:
case FireError::FACING:
Expand All @@ -417,7 +427,7 @@ int FakeAircraftClass::_Mission_Attack()
}
return 1;
}
this->Fire(this->Target, this->SelectWeapon(this->Target));
this->Fire(this->Target, selectedWeapon);
MapClass::Instance->GetCellAt(this->Target->GetCoords())->ScatterContent(this->Location, true, false, false);
this->SetDestination(this->Target, 1);
this->MissionStatus = (int)AirAttackStatus::FireAtTarget5_Strafe;
Expand All @@ -434,16 +444,18 @@ int FakeAircraftClass::_Mission_Attack()
{
if (this->Target)
{
switch (this->GetFireError(this->Target,this->SelectWeapon(this->Target),true))
const int selectedWeapon = this->SelectWeapon(this->Target);

switch (this->GetFireError(this->Target, selectedWeapon, true))
{
case FireError::OK:
case FireError::FACING:
case FireError::RANGE:
case FireError::CLOAKED:
this->Fire(this->Target, this->SelectWeapon(this->Target));
this->Fire(this->Target, selectedWeapon);
MapClass::Instance->GetCellAt(this->Target->GetCoords())->ScatterContent(this->Location, true, false, false);
this->MissionStatus = (int)AirAttackStatus::FlyToPosition;
return this->GetWeapon(0)->WeaponType->Range + 1024 / this->Type->Speed;
return (this->GetWeapon(0)->WeaponType->Range + AircraftConstants::StrafeCalculationOffset) / this->Type->Speed;
default:
if (!this->Ammo) {
this->MissionStatus = (int)AirAttackStatus::ReturnToBase;
Expand Down Expand Up @@ -504,11 +516,17 @@ AbstractClass* FakeAircraftClass::_GreatestThreat(ThreatType threatType, CoordSt
{
if (RulesExtData::Instance()->ExpandAircraftMission && !this->Team && this->Ammo && !this->Airstrike && !this->Spawned)
{
if (WeaponTypeClass* const pPrimaryWeapon = this->GetWeapon(0)->WeaponType)
threatType |= pPrimaryWeapon->AllowedThreats();
if (auto pWeaponStruct = this->GetWeapon(0))
{
if (WeaponTypeClass* const pPrimaryWeapon = pWeaponStruct->WeaponType)
threatType |= pPrimaryWeapon->AllowedThreats();
}

if (WeaponTypeClass* const pSecondaryWeapon = this->GetWeapon(1)->WeaponType)
threatType |= pSecondaryWeapon->AllowedThreats();
if (auto pWeaponStruct = this->GetWeapon(1))
{
if (WeaponTypeClass* const pSecondaryWeapon = pWeaponStruct->WeaponType)
threatType |= pSecondaryWeapon->AllowedThreats();
}
}

return this->FootClass::GreatestThreat(threatType, pSelectCoords, onlyTargetHouseEnemy); // FootClass_GreatestThreat (Prevent circular calls)
Expand Down Expand Up @@ -626,6 +644,8 @@ NOINLINE void CalculateVelocity(AircraftClass* pThis , BulletClass* pBullet , Ab
velocity->SetIfZeroXYZ();

const double dist = velocity->Length();
if (dist < AircraftConstants::MinVelocityLength)
return;
const double scale = aircraftSpeed / dist;

velocity->X *= scale;
Expand Down Expand Up @@ -725,6 +745,8 @@ NOINLINE void CalculateVelocity(AircraftClass* pThis , BulletClass* pBullet , Ab
velocity->SetIfZeroXYZ();

double finalSpeed = velocity->Length();
if (finalSpeed < AircraftConstants::MinVelocityLength)
return;
double speedScale = maxBulletSpeed / finalSpeed;

velocity->X *= speedScale;
Expand All @@ -734,8 +756,13 @@ NOINLINE void CalculateVelocity(AircraftClass* pThis , BulletClass* pBullet , Ab
}

BulletClass* FakeAircraftClass::_FireAt(AbstractClass* pTarget, int nWeaponIdx) {
if (!pTarget)
return nullptr;

auto const pTypeExt = TechnoTypeExtContainer::Instance.Find(this->Type);
if (!pTypeExt)
return this->TechnoClass::Fire(pTarget, nWeaponIdx);

bool DropPassengers = pTypeExt->Paradrop_DropPassangers;

if (this->Passengers.FirstPassenger)
Expand Down Expand Up @@ -834,10 +861,10 @@ WeaponStruct* FakeAircraftClass::_GetWeapon(int weaponIndex)
{
auto const pExt = AircraftExtContainer::Instance.Find(this);

if (pExt->CurrentAircraftWeaponIndex >= 0)
if (pExt && pExt->CurrentAircraftWeaponIndex >= 0)
return this->TechnoClass::GetWeapon(pExt->CurrentAircraftWeaponIndex);
else
return this->TechnoClass::GetWeapon(this->SelectWeapon(this->Target));

return this->TechnoClass::GetWeapon(this->SelectWeapon(this->Target));
}

// Spy plane, airstrike etc.
Expand Down
9 changes: 9 additions & 0 deletions src/Ext/Aircraft/Body.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
class AbstractClass;
class AircraftClass;
class WeaponTypeClass;

namespace AircraftConstants {
constexpr int MinDistanceForFacing = 512;
constexpr int MinDistanceToTarget = 16;
constexpr int FacingErrorTimeout = 45;
constexpr int LandingProximity = 768;
constexpr int StrafeCalculationOffset = 1024;
constexpr double MinVelocityLength = 0.001;
}
class AircraftExtData : public FootExtData
{
public:
Expand Down
5 changes: 3 additions & 2 deletions src/Ext/BuildingType/Hooks.DockPoseDir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "Body.h"

#include <AircraftClass.h>
#include <Ext/Aircraft/Body.h>

#include <AircraftTrackerClass.h>
#include <Locomotor/FlyLocomotionClass.h>
Expand Down Expand Up @@ -205,7 +206,7 @@ ASMJIT_PATCH(0x4CF190, FlyLocomotionClass_FlightUpdate_SetPrimaryFacing, 0x6) //
const auto footCoords = pFoot->GetCoords();
const auto desired = DirStruct(std::atan2((double)(footCoords.Y - destination.Y), (double)(destination.X - footCoords.X)));

if (!iFly || !iFly->Is_Strafe() || horizontalDistance(footCoords) > 768 // I don't know why it's 3 cells' length, but its vanilla, keep it
if (!iFly || !iFly->Is_Strafe() || horizontalDistance(footCoords) > AircraftConstants::LandingProximity // I don't know why it's 3 cells' length, but its vanilla, keep it
|| Math::abs(static_cast<short>(static_cast<short>(desired.Raw) - static_cast<short>(pFoot->PrimaryFacing.Current().Raw))) >= 8192)
{
pFoot->PrimaryFacing.Set_Desired(desired);
Expand Down Expand Up @@ -408,7 +409,7 @@ ASMJIT_PATCH(0x4CF3D0, FlyLocomotionClass_FlightUpdate_SetFlightLevel, 0x7) // M
R->EBP(pThis);

// Same as vanilla
if (pThis->IsElevating && distance < 768)
if (pThis->IsElevating && distance < AircraftConstants::LandingProximity)
{
// Fast descent
const auto floorHeight = MapClass::Instance->GetCellFloorHeight(pThis->MovingDestination);
Expand Down