diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
| commit | 8631a7a07743af00431c6f33361ab06405bcf114 (patch) | |
| tree | e7d983394f5ca0cbe2465780e8205cf32ba67ad3 /indra/llcommon/lluri.cpp | |
| parent | 57da3e609fddb37ef3ddef830a0be84ebc5337bd (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with tip of Master after a Viewer release
Diffstat (limited to 'indra/llcommon/lluri.cpp')
| -rw-r--r-- | indra/llcommon/lluri.cpp | 2 |
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); |