Skip to content

Missing nullcheck for armors caused a crash when Papyrus passed in "NONE" armors. #2

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

Open
SeaSparrowOG wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Missing nullcheck for armors caused a crash when Papyrus passed in "NONE" armors. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7320eeb
Nullcheck a_armor in WouldReplaceAny
SeaSparrowOG May 27, 2025
7b92535
Updated build dependencies, possible regression in RE::ActorValue enum
May 27, 2025
db8e4f2
Fixed iterator being invalid during removal
May 27, 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
2 changes: 1 addition & 1 deletion external/CommonLibSSE
Open in desktop
Submodule CommonLibSSE updated 159 files
4 changes: 4 additions & 0 deletions src/main/ArmorVariant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ auto ArmorVariant::WouldReplace(const RE::TESObjectARMA* a_armorAddon) const ->

auto ArmorVariant::WouldReplaceAny(const RE::TESObjectARMO* a_armor) const -> bool
{
if (!a_armor) {
return false;
}

for (auto& armorAddon : a_armor->armorAddons) {
if (WouldReplace(armorAddon)) {
return true;
Expand Down
9 changes: 6 additions & 3 deletions src/main/DynamicArmorManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,12 @@ void DynamicArmorManager::ApplyVariant(RE::Actor* a_actor, const std::string& a_
}

// Consider only armor items affected by the new variant
for (auto& armor : armorItems) {
if (!newVariant.WouldReplaceAny(armor)) {
armorItems.erase(armor);
for (auto armorItemIterator = armorItems.begin(); armorItemIterator != armorItems.end();) {
if (newVariant.WouldReplaceAny(*armorItemIterator)) {
armorItemIterator = armorItems.erase(armorItemIterator);
}
else {
++armorItemIterator;
}
}

Expand Down
22 changes: 11 additions & 11 deletions src/main/EnumLookup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class EnumLookup

private:
inline static const std::unordered_map<std::string, RE::ActorValue> ActorValueLookup{
{ "AGGRESSION"s, RE::ActorValue::kAggression },
{ "AGGRESSION"s, RE::ActorValue::kAggresion },
{ "CONFIDENCE"s, RE::ActorValue::kConfidence },
{ "ENERGY"s, RE::ActorValue::kEnergy },
{ "MORALITY"s, RE::ActorValue::kMorality },
Expand Down Expand Up @@ -95,7 +95,7 @@ class EnumLookup
{ "STAMINA"s, RE::ActorValue::kStamina },
{ "HEALRATE"s, RE::ActorValue::kHealRate },
{ "MAGICKARATE"s, RE::ActorValue::kMagickaRate },
{ "STAMINARATE"s, RE::ActorValue::kStaminaRate },
{ "STAMINARATE"s, RE::ActorValue::KStaminaRate },
{ "SPEEDMULT"s, RE::ActorValue::kSpeedMult },
{ "INVENTORYWEIGHT"s, RE::ActorValue::kInventoryWeight },
{ "CARRYWEIGHT"s, RE::ActorValue::kCarryWeight },
Expand All @@ -112,20 +112,20 @@ class EnumLookup
{ "FROSTRESIST"s, RE::ActorValue::kResistFrost },
{ "MAGICRESIST"s, RE::ActorValue::kResistMagic },
{ "DISEASERESIST"s, RE::ActorValue::kResistDisease },
{ "PERCEPTIONCONDITION"s, RE::ActorValue::kPerceptionCondition },
{ "ENDURANCECONDITION"s, RE::ActorValue::kEnduranceCondition },
{ "LEFTATTACKCONDITION"s, RE::ActorValue::kLeftAttackCondition },
{ "RIGHTATTACKCONDITION"s, RE::ActorValue::kRightAttackCondition },
{ "LEFTMOBILITYCONDITION"s, RE::ActorValue::kLeftMobilityCondition },
{ "RIGHTMOBILITYCONDITION"s, RE::ActorValue::kRightMobilityCondition },
{ "BRAINCONDITION"s, RE::ActorValue::kBrainCondition },
{ "PERCEPTIONCONDITION"s, RE::ActorValue::kUnknown46 },
{ "ENDURANCECONDITION"s, RE::ActorValue::kUnknown47 },
{ "LEFTATTACKCONDITION"s, RE::ActorValue::kUnknown48 },
{ "RIGHTATTACKCONDITION"s, RE::ActorValue::kUnknown49 },
{ "LEFTMOBILITYCONDITION"s, RE::ActorValue::kUnknown50 },
{ "RIGHTMOBILITYCONDITION"s, RE::ActorValue::kUnknown51 },
{ "BRAINCONDITION"s, RE::ActorValue::kUnknown52 },
{ "PARALYSIS"s, RE::ActorValue::kParalysis },
{ "INVISIBILITY"s, RE::ActorValue::kInvisibility },
{ "NIGHTEYE"s, RE::ActorValue::kNightEye },
{ "DETECTLIFERANGE"s, RE::ActorValue::kDetectLifeRange },
{ "WATERBREATHING"s, RE::ActorValue::kWaterBreathing },
{ "WATERWALKING"s, RE::ActorValue::kWaterWalking },
{ "IGNORECRIPPLEDLIMBS"s, RE::ActorValue::kIgnoreCrippledLimbs },
{ "IGNORECRIPPLEDLIMBS"s, RE::ActorValue::kUnknown59 },
{ "FAME"s, RE::ActorValue::kFame },
{ "INFAMY"s, RE::ActorValue::kInfamy },
{ "JUMPINGBONUS"s, RE::ActorValue::kJumpingBonus },
Expand Down Expand Up @@ -228,7 +228,7 @@ class EnumLookup
{ "VAMPIREPERKS"s, RE::ActorValue::kVampirePerks },
{ "GRABACTOROFFSET"s, RE::ActorValue::kGrabActorOffset },
{ "GRABBED"s, RE::ActorValue::kGrabbed },
{ "DEPRECATED05"s, RE::ActorValue::kDEPRECATED05 },
{ "DEPRECATED05"s, RE::ActorValue::kUnknown162 },
{ "REFLECTDAMAGE"s, RE::ActorValue::kReflectDamage },
};
};
2 changes: 1 addition & 1 deletion tools/BethesdaCMakeModules
Open in desktop
Submodule BethesdaCMakeModules updated 3 files
+107 −26 Modules/Papyrus.cmake
+82 −0 Modules/Spriggit.cmake
+28 −17 README.md
2 changes: 1 addition & 1 deletion tools/SKSE-CMakeModules
Open in desktop
Submodule SKSE-CMakeModules updated 1 files
+0 −1 Modules/version.rc.in