SkillRanks: fix UB in GetAreaModifier dereferencing empty std::optional#230
Open
plenarius wants to merge 1 commit into
Open
SkillRanks: fix UB in GetAreaModifier dereferencing empty std::optional#230plenarius wants to merge 1 commit into
plenarius wants to merge 1 commit into
Conversation
`pArea->nwnxGet<int>(...)` returns `std::optional<int>` and is empty when the area has no modifier set for the requested skill (i.e. SetAreaModifier was never called for that combination). Dereferencing it via `*` was undefined behaviour. Use `.value_or(0)` to return the natural identity for an unset modifier, matching how the internal skill resolution at line 675-677 already treats an empty optional (it skips the `+= *areaMod` accumulation). Fixes nwnxee#1855
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
SkillRanks::GetAreaModifierdereferenced thestd::optional<int>returned bypArea->nwnxGet<int>(...)without checking whether it had a value. WhenSetAreaModifierhad never been called for that(area, skillId)pair, the optional was empty and*on it was undefined behaviour.Fixed by using
.value_or(0)to return the natural identity for an unset modifier. This matches how the plugin's internal skill-resolution path already treats an empty optional (it skips the+= *areaModaccumulation), so observable behaviour for callers is consistent.Tracks upstream issue nwnxee#1855.