From 787b63f4c29f6ef56f355ec80084458a1bbcfb35 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 20 Aug 2025 20:33:59 +0300
Subject: #3922 Crash on removeStringNoUndo

---
 indra/llui/lltextbase.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/llui/lltextbase.cpp')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 7007049e1c..382847d68f 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1069,6 +1069,14 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
 
 S32 LLTextBase::removeStringNoUndo(S32 pos, S32 length)
 {
+    S32 text_length = (S32)getLength();
+    if (pos >= text_length || pos < 0)
+    {
+        return 0; // nothing to remove
+    }
+    // Clamp length to not go past the end of the text
+    length = std::min(length, text_length - pos);
+
     beforeValueChange();
     segment_set_t::iterator seg_iter = getSegIterContaining(pos);
     while(seg_iter != mSegments.end())
-- 
cgit v1.2.3