RmlUI Context handling improvements #1761
Open
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
* manage contexts in the "contexts_to_remove" hashset more carefully to prevent use-after-free crash. * Remove context from removal hashset if it is "recreated" in the same frame.
sprunk
reviewed
Nov 8, 2024
| Rml::Context* context = Rml::GetContext(name); | ||
| if (context == nullptr) { | ||
| context = Rml::CreateContext(name, {0, 0}); | ||
| } else if (state->contexts_to_remove.contains(context)) { |
There was a problem hiding this comment.
Suggested change
| } else if (state->contexts_to_remove.contains(context)) { | |
| } else if (state->contexts_to_remove.contains(context)) { | |
| // can happen if name reused on the same frame |
| if (context == nullptr) { | ||
| context = Rml::CreateContext(name, {0, 0}); | ||
| } else if (state->contexts_to_remove.contains(context)) { | ||
| state->contexts_to_remove.erase(context); |
There was a problem hiding this comment.
Maybe we could do without the .contains check? .erase has to search for the element anyway so we'd avoid searching it twice if present and won't see any difference if not.
There was a problem hiding this comment.
I didn't realize I could do that
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.
context handling improvements
use ranges::rotate to reorder clicked context