summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluri.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-07-19 22:24:33 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-07-19 22:24:33 +0000
commit1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch)
tree33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llcommon/lluri.cpp
parentdc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff)
parent4c849ba91363f82da05cce1221b04075a6ca72af (diff)
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
Diffstat (limited to 'indra/llcommon/lluri.cpp')
-rw-r--r--indra/llcommon/lluri.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index 9942bc0cf8..22711a83d2 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -276,7 +276,7 @@ std::string LLURI::escapePathAndData(const std::string &str)
std::string fragment;
size_t fragment_pos = str.find('#');
- if (fragment_pos != std::string::npos)
+ if ((fragment_pos != std::string::npos) && (fragment_pos > delim_pos))
{
query = str.substr(path_size, fragment_pos - path_size);
fragment = str.substr(fragment_pos);