summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluri.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-05-30 14:54:15 -0700
committerMerov Linden <merov@lindenlab.com>2013-05-30 14:54:15 -0700
commit1f84fe88c66558411382e515f6abe8b677f9b98d (patch)
treeebefe3e8615adebf46463b761538c2f7636a2216 /indra/llcommon/lluri.cpp
parente72a9ebf638db2197920115be57493a40d54d2b6 (diff)
parentdcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff)
Pull merge from viewer-release
Diffstat (limited to 'indra/llcommon/lluri.cpp')
-rwxr-xr-xindra/llcommon/lluri.cpp29
1 files changed, 24 insertions, 5 deletions
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index 21456a599b..37f5b3d6a3 100755
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -129,11 +129,30 @@ std::string LLURI::unescape(const std::string& str)
{
++it;
if(it == end) break;
- U8 c = hex_as_nybble(*it++);
- c = c << 4;
- if (it == end) break;
- c |= hex_as_nybble(*it);
- ostr.put((char)c);
+
+ if(is_char_hex(*it))
+ {
+ U8 c = hex_as_nybble(*it++);
+
+ c = c << 4;
+ if (it == end) break;
+
+ if(is_char_hex(*it))
+ {
+ c |= hex_as_nybble(*it);
+ ostr.put((char)c);
+ }
+ else
+ {
+ ostr.put((char)c);
+ ostr.put(*it);
+ }
+ }
+ else
+ {
+ ostr.put('%');
+ ostr.put(*it);
+ }
}
else
{