Fix potential null access in TextEdit
#90274
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
AThousandShips
added
bug
crash
topic:gui
cherrypick:4.2
AThousandShips
commented
Apr 5, 2024
scene/gui/text_edit.cpp
Outdated
| @@ -7780,7 +7780,7 @@ void TextEdit::_update_gutter_width() { | |||
|
|
|||
| /* Syntax highlighting. */ | |||
| Dictionary TextEdit::_get_line_syntax_highlighting(int p_line) { | |||
| return syntax_highlighter.is_null() && !setting_text ? Dictionary() : syntax_highlighter->get_line_syntax_highlighting(p_line); | |||
| return syntax_highlighter.is_null() || setting_text ? Dictionary() : syntax_highlighter->get_line_syntax_highlighting(p_line); | |||
There was a problem hiding this comment.
I swapped it to setting_text as making it syntax_highlighter.is_null() || !setting_text made syntax highlighting go away in the editor, unsure why this condition is here but this way it didn't break the editor, if it's unnecessary I can remove that part
There was a problem hiding this comment.
I would add parentheses because it's not clear to me what's the precedence between || and ?.
AThousandShips
force-pushed
the
syntax_fix
branch
from
2f86917
to
978d768
Compare
AThousandShips
added
the
cherrypick:4.3
AThousandShips
force-pushed
the
syntax_fix
branch
from
978d768
to
e88d28d
Compare
AThousandShips
force-pushed
the
syntax_fix
branch
from
e88d28d
to
d4cf294
Compare
akien-mga
approved these changes
Jul 17, 2024
akien-mga
removed
the
cherrypick:4.3
|
Thanks! |
|
Thank you! |
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.
The highlighter would be accessed when
setting_text == trueregardless of it being valid