summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-02 11:50:17 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-02 11:50:17 +0300
commite03f1521c82545a49b289d624c8b26be3d1fb3d6 (patch)
tree45aa68c99365064561d47530520119792e2902de /indra
parent90573badb4fcea3ae771c466e859854547ed7ad5 (diff)
MAINT-5023 URIparser crash in LLUrlEntryBase::urlToLabelWithGreyQuery
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/lluriparser.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index e24e53426e..8c456ee879 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -124,6 +124,18 @@ void LLUriParser::textRangeToString(UriTextRangeA& textRange, std::string& str)
return;
}
+ if(textRange.first == NULL)
+ {
+ LL_WARNS() << "textRange.first is NULL for uri: " << mNormalizedUri << LL_ENDL;
+ return;
+ }
+
+ if(textRange.afterLast == NULL)
+ {
+ LL_WARNS() << "textRange.afterLast is NULL for uri: " << mNormalizedUri << LL_ENDL;
+ return;
+ }
+
S32 len = textRange.afterLast - textRange.first;
if (len)
{