From 8fcf691623c21dedd0e478fb8d013a28a2959811 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 22 Apr 2023 14:19:42 +0200
Subject: [PATCH] Load correct localized version of emoji dictionary and guard
against access violation exception
---
indra/llui/llemojidictionary.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index d3064074847..bb5c94689a8 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -141,7 +141,13 @@ void LLEmojiDictionary::initClass()
LLSD data;
- const std::string filename = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN).front();
+ auto filenames = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN);
+ if (filenames.empty())
+ {
+ LL_WARNS() << "Emoji file characters not found" << LL_ENDL;
+ return;
+ }
+ const std::string filename = filenames.back();
llifstream file(filename.c_str());
if (file.is_open())
{
--
GitLab