- Fix crash that happen when Unit using DroppodLocomotor because …

…of `DroppodType` is exclusive to `Infantry` - Fix crash when `TypeConvertGroup::Convert` is called with `nullptr` Owner and get checked with `EnumFunctions::CanTargetHouse`
Phobos-developers · Mar 23, 2024 · 26f1b8a · 26f1b8a
1 parent 477ee2a
commit 26f1b8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/Ext/TechnoType/Body.cpp b/src/Ext/TechnoType/Body.cpp
@@ -407,16 +407,10 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 		this->InterceptorType.reset();
 	}
 
-	if (this->OwnerObject()->WhatAmI() == AbstractType::InfantryType)
-	{
-		if (this->DroppodType == nullptr)
-			this->DroppodType = std::make_unique<DroppodTypeClass>();
-		this->DroppodType->LoadFromINI(pINI, pSection);
-	}
-	else
-	{
-		this->DroppodType.reset();
-	}
+	if (this->DroppodType == nullptr)
+		this->DroppodType = std::make_unique<DroppodTypeClass>();
+
+	this->DroppodType->LoadFromINI(pINI, pSection);
 }
 
 template <typename T>

diff --git a/src/New/Type/Affiliated/TypeConvertGroup.cpp b/src/New/Type/Affiliated/TypeConvertGroup.cpp
@@ -7,7 +7,7 @@ void TypeConvertGroup::Convert(FootClass* pTargetFoot, const std::vector<TypeCon
 	{
 		if (!toType.isset() || !toType.Get()) continue;
 
-		if (!EnumFunctions::CanTargetHouse(affectedHouses, pOwner, pTargetFoot->Owner))
+		if (pOwner && !EnumFunctions::CanTargetHouse(affectedHouses, pOwner, pTargetFoot->Owner))
 			continue;
 
 		if (fromTypes.size())