fix crash when removing grab effects from dead monsters #79009
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
github-actions
bot
added
[C++]
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -2954,17 +2954,24 @@ void monster::die( Creature *nkiller ) | |||
| if( !grabbed ) { | |||
| you->add_msg_player_or_npc( m_good, _( "The last enemy holding you collapses!" ), | |||
| _( "The last enemy holding <npcname> collapses!" ) ); | |||
| // A loop for safety | |||
| std::vector<efftype_id> effect_ids; // to avoid dangling references, prepare effect IDs before removing them | |||
There was a problem hiding this comment.
[JSON & C++ formatters] reported by reviewdog 🐶
Suggested change
| std::vector<efftype_id> effect_ids; // to avoid dangling references, prepare effect IDs before removing them | |
| std::vector<efftype_id> | |
| effect_ids; // to avoid dangling references, prepare effect IDs before removing them |
github-actions
bot
added
the
json-styled
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
Bugfixes "Fix random crash when monster grabbing the player dies"
Purpose of change
Fix #76748
Describe the solution
https://github.com/CleverRaven/Cataclysm-DDA/blob/master/src/monster.cpp#L2958 looping through referenced objects while removing them, which cause dangling references.
The fix is to gather IDs of effect to be removed and remove by ID.
Describe alternatives you've considered
Testing
I meet this crash on my mac build with a high frequency when melee attack to kill a zombie strider.
Additional context