summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2026-08-10 18:57:28 +0300
committerAndrey Lihatskiy <118752495+marchcat@users.noreply.github.com>2026-08-10 19:33:35 +0300
commit2ba0e20fd929c1fb3444c7fa9dd796db6dba0954 (patch)
tree8f9bbb57b59ba2d92ea977f7137e6c18b112bada
parent8ec9cf9cf17fbf14698116dbd51d688253adf299 (diff)
#6106 Guard emoji picker navigation bounds
-rw-r--r--indra/newview/llfloateremojipicker.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index ab76f3473b..d8dd30c9cc 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -1001,6 +1001,9 @@ bool LLFloaterEmojiPicker::moveFocusedIconNext()
if (mHoveredIcon)
return false;
+ if (mFocusedIconRow < 0 || static_cast<size_t>(mFocusedIconRow) >= mEmojiGrid->getPanelList().size())
+ return false;
+
LLScrollingPanel* panel = mEmojiGrid->getPanelList()[mFocusedIconRow];
LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
S32 colCount = row ? static_cast<S32>(row->mList->getPanelList().size()) : 0;