Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #53881 from Ev1lbl0w/fix_textedit_null_crash

4.0
Yuri Roubinsky 2021-10-17 15:33:38 +07:00 committed by GitHub
parent 5bf01654d7 88985cbf3a
commit 468b987aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/text_edit.cpp
Unescape Escape View File

@ -3623,6 +3623,8 @@ int TextEdit::get_caret_wrap_index() const {
} }
String TextEdit::get_word_under_caret() const { String TextEdit::get_word_under_caret() const {
ERR_FAIL_INDEX_V(caret.line, text.size(), "");
ERR_FAIL_INDEX_V(caret.column, text[caret.line].length() + 1, "");
PackedInt32Array words = TS->shaped_text_get_word_breaks(text.get_line_data(caret.line)->get_rid()); PackedInt32Array words = TS->shaped_text_get_word_breaks(text.get_line_data(caret.line)->get_rid());
for (int i = 0; i < words.size(); i = i + 2) { for (int i = 0; i < words.size(); i = i + 2) {
if (words[i] <= caret.column && words[i + 1] > caret.column) { if (words[i] <= caret.column && words[i + 1] > caret.column) {