From 03921adb1211c6def0ce5c791e2455643142a92a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 11 Jan 2021 17:07:03 +0200
Subject: SL-2202 Add exception handling around boost::regex_match() calls in
 the viewer

---
 indra/llui/llurlentry.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index e6835f73fb..ff742a9530 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -35,6 +35,7 @@
 
 #include "llavatarnamecache.h"
 #include "llcachename.h"
+#include "llregex.h"
 #include "lltrans.h"
 #include "lluicolortable.h"
 #include "message.h"
@@ -1388,7 +1389,7 @@ std::string LLUrlEntryIcon::getIcon(const std::string &url)
 	// Grep icon info between <icon>...</icon> tags
 	// matches[1] contains the icon name/path
 	boost::match_results<std::string::const_iterator> matches;
-	mIcon = (boost::regex_match(url, matches, mPattern) && matches[1].matched)
+	mIcon = (ll_regex_match(url, matches, mPattern) && matches[1].matched)
 		? matches[1]
 		: LLStringUtil::null;
 	LLStringUtil::trim(mIcon);
-- 
cgit v1.2.3