Change decode - check order in path decoding

refs #9470

diff --git a/lib/base/url.cpp b/lib/base/url.cpp
index c456d36dee7d03d39e09c9a5b8d3525a0368f641..c491dd35a682f173f05ab429604fc038ef6be8b0 100644 (file)
--- a/lib/base/url.cpp
+++ b/lib/base/url.cpp
@@ -215,11 +215,11 @@ bool Url::ParsePath(const String& path)
                if (token.IsEmpty())
                        continue;
 
-               String decodedToken = Utility::UnescapeString(token);
-
-               if (!ValidateToken(decodedToken, ACPATHSEGMENT))
+               if (!ValidateToken(token, ACPATHSEGMENT))
                        return false;
 
+               String decodedToken = Utility::UnescapeString(token);
+
                m_Path.push_back(decodedToken);
        }