From 2ba0e20fd929c1fb3444c7fa9dd796db6dba0954 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 10 Aug 2026 18:57:28 +0300 Subject: #6106 Guard emoji picker navigation bounds --- indra/newview/llfloateremojipicker.cpp | 3 +++ 1 file changed, 3 insertions(+) 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(mFocusedIconRow) >= mEmojiGrid->getPanelList().size()) + return false; + LLScrollingPanel* panel = mEmojiGrid->getPanelList()[mFocusedIconRow]; LLEmojiGridRow* row = dynamic_cast(panel); S32 colCount = row ? static_cast(row->mList->getPanelList().size()) : 0; -- cgit v1.3