#3814 Out of range exception in TextCmdRemove::execute

akleshchev · akleshchev · commit 4e80ec7e962d · 2025-03-26T21:36:43.000+02:00
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
@@ -209,8 +209,15 @@ class LLTextEditor::TextCmdRemove : public LLTextBase::TextCmd
     }
     virtual bool execute( LLTextBase* editor, S32* delta )
     {
-        mWString = editor->getWText().substr(getPosition(), mLen);
-        *delta = remove(editor, getPosition(), mLen );
+        try
+        {
+            mWString = editor->getWText().substr(getPosition(), mLen);
+            *delta = remove(editor, getPosition(), mLen);
+        }
+        catch (std::out_of_range&)
+        {
+            return false;
+        }
         return (*delta != 0);
     }
     virtual S32 undo( LLTextBase* editor )

Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,15 @@ class LLTextEditor::TextCmdRemove : public LLTextBase::TextCmd`
`209`	`209`	`}`
`210`	`210`	`virtual bool execute( LLTextBase* editor, S32* delta )`
`211`	`211`	`{`
`212`		`- mWString = editor->getWText().substr(getPosition(), mLen);`
`213`		`- *delta = remove(editor, getPosition(), mLen );`
	`212`	`+ try`
	`213`	`+ {`
	`214`	`+ mWString = editor->getWText().substr(getPosition(), mLen);`
	`215`	`+ *delta = remove(editor, getPosition(), mLen);`
	`216`	`+ }`
	`217`	`+ catch (std::out_of_range&)`
	`218`	`+ {`
	`219`	`+ return false;`
	`220`	`+ }`
`214`	`221`	`return (*delta != 0);`
`215`	`222`	`}`
`216`	`223`	`virtual S32 undo( LLTextBase* editor )`