Better dialog queueing error handling, documentation. #50763
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
| @@ -2364,7 +2368,11 @@ void talk_effect_fun_t::set_weighted_list_eocs( const JsonObject &jo, | |||
| } | |||
| eocs.add( eoc, weight ); | |||
| } | |||
| function = [&eocs]( const dialogue & ) { | |||
| function = [eocs]( const dialogue & ) { | |||
There was a problem hiding this comment.
Why do you need to copy it?
Suggested change
| function = [eocs]( const dialogue & ) { | |
| function = [&eocs]( const dialogue & ) { |
There was a problem hiding this comment.
In the portal branch if you don't copy it you get an invalid array error. Not an expert on c++ memory handling but pretty sure if you don't copy it, it will go out of scope if set for the future.
There was a problem hiding this comment.
Oh, you're setting a member variable to this function. Yeah, eocs will go out of scope and then this function will trigger UAF.
actual-nh
added
<Bugfix>
satheon49
pushed a commit
to satheon49/Cataclysm-DDA
that referenced
this pull request
Aug 14, 2021
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
Infrastructure "Better dialog queueing error handling, documentation"
Purpose of change
Fix for issues found while working on #50685.
Describe the solution
Describe alternatives you've considered
Testing
Additional context