Преглед изворни кода

Merge pull request #53881 from Ev1lbl0w/fix_textedit_null_crash

Yuri Roubinsky пре 3 година
родитељ
комит
468b987aa3
1 измењених фајлова са 2 додато и 0 уклоњено
  1. 2 0
      scene/gui/text_edit.cpp

+ 2 - 0
scene/gui/text_edit.cpp

@@ -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) {