Fix NPC wielding items from within holsters and the like #36506
Merged
Conversation
This file contains 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
- Check result of `inventory::find_item` before using it. Using `INT_MIN` is safe (`inventory::find_item` will return a null item reference), but this is clearer. - Add assertions to catch future errors. - Compare item pointers, not names.
ZhilkinSerg
added
<Bugfix>
This was referenced Jan 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SUMMARY: NoneThe culprit is in
npc::wield. If the item to wield is a non-empty holster, it invokes that item. This will usually wield the contained item.But
npc::wieldcontinues to wield the originally given item (the contained item). This will effectively wield the item twice.However, the item reference given to
npc::wieldis a reference to the contained item (an entry initem::contents). This reference is invalid after the item has been wielded from the holster. So the remaining code would invoke UB.Hopefully fixes issues like #35140 (I can't reproduce the issue from the linked save).