From e1c8126d157dc39415d1a743d8f4fdb1277746db Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 22 Jul 2024 10:58:33 -0400
Subject: Fix nullptr crash in LLScrollListCtrl::getSelectedItemLabel

---
 indra/llui/llscrolllistctrl.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 74a9641836..1d9564d107 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1479,7 +1479,11 @@ const std::string LLScrollListCtrl::getSelectedItemLabel(S32 column) const
     item = getFirstSelected();
     if (item)
     {
-        return item->getColumn(column)->getValue().asString();
+        auto col = item->getColumn(column);
+        if(col)
+        {
+            return col->getValue().asString();
+        }
     }
 
     return LLStringUtil::null;
-- 
cgit v1.2.3