From 79680891a73be074aa449a9ccdf695b0afd300d8 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 28 Dec 2007 22:19:29 +0000 Subject: svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed. --- indra/llcommon/lluri.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp index 5e4dec7f82..deeee3173d 100644 --- a/indra/llcommon/lluri.cpp +++ b/indra/llcommon/lluri.cpp @@ -57,7 +57,9 @@ std::string LLURI::escape(const std::string& str, const std::string & allowed) { ostr << "%" << std::uppercase << std::hex << std::setw(2) << std::setfill('0') - << static_cast(c); + // VWR-4010 Cannot cast to U32 because sign-extension on + // chars > 128 will result in FFFFFFC3 instead of F3. + << static_cast(static_cast(c)); } else { -- cgit v1.2.3