summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmediaentry.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-01-11 17:07:03 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-01-11 17:07:03 +0200
commit03921adb1211c6def0ce5c791e2455643142a92a (patch)
treeb03662cd875f79790958948ebdcfb70834125f60 /indra/llprimitive/llmediaentry.cpp
parent55267aab80c945da44587b62822095838ac4a6bc (diff)
SL-2202 Add exception handling around boost::regex_match() calls in the viewer
Diffstat (limited to 'indra/llprimitive/llmediaentry.cpp')
-rw-r--r--indra/llprimitive/llmediaentry.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llprimitive/llmediaentry.cpp b/indra/llprimitive/llmediaentry.cpp
index 02aba2bd83..53e9555c6a 100644
--- a/indra/llprimitive/llmediaentry.cpp
+++ b/indra/llprimitive/llmediaentry.cpp
@@ -27,8 +27,7 @@
#include "linden_common.h"
#include "llmediaentry.h"
#include "lllslconstants.h"
-
-#include <boost/regex.hpp>
+#include "llregex.h"
// LLSD key defines
// DO NOT REORDER OR REMOVE THESE!
@@ -456,7 +455,7 @@ static bool pattern_match(const std::string &candidate_str, const std::string &p
// case-insensitive matching:
boost::regex regexp(expression, boost::regex::perl|boost::regex::icase);
- return boost::regex_match(candidate_str, regexp);
+ return ll_regex_match(candidate_str, regexp);
}
bool LLMediaEntry::checkCandidateUrl(const std::string& url) const