Fix the order of highSurrogate and lowSurrogate.

JasonYang-MSFT · JasonYang-MSFT · commit b2aadf60d1ef · 2016-09-27T16:05:41.000+08:00
diff --git a/Release/src/utilities/asyncrt_utils.cpp b/Release/src/utilities/asyncrt_utils.cpp
@@ -377,12 +377,13 @@ std::string __cdecl conversions::utf16_to_utf8(const utf16string &w)
         // Check for high surrogate.
         if (src >= H_SURROGATE_START && src <= H_SURROGATE_END)
         {
-            const auto highSurrogate = w[++index];
+            const auto highSurrogate = src;
+			++index;
             if (index == w.size())
             {
                 throw std::range_error("UTF-16 string is missing low surrogate");
             }
-            const auto lowSurrogate = src;
+            const auto lowSurrogate = w[index];
             if (lowSurrogate < L_SURROGATE_START || lowSurrogate > L_SURROGATE_END)
             {
                 throw std::range_error("UTF-16 string has invalid low surrogate");

Original file line number	Diff line number	Diff line change
`@@ -377,12 +377,13 @@ std::string __cdecl conversions::utf16_to_utf8(const utf16string &w)`
`377`	`377`	`// Check for high surrogate.`
`378`	`378`	`if (src >= H_SURROGATE_START && src <= H_SURROGATE_END)`
`379`	`379`	`{`
`380`		`- const auto highSurrogate = w[++index];`
	`380`	`+ const auto highSurrogate = src;`
	`381`	`+ ++index;`
`381`	`382`	`if (index == w.size())`
`382`	`383`	`{`
`383`	`384`	`throw std::range_error("UTF-16 string is missing low surrogate");`
`384`	`385`	`}`
`385`		`- const auto lowSurrogate = src;`
	`386`	`+ const auto lowSurrogate = w[index];`
`386`	`387`	`if (lowSurrogate < L_SURROGATE_START \|\| lowSurrogate > L_SURROGATE_END)`
`387`	`388`	`{`
`388`	`389`	`throw std::range_error("UTF-16 string has invalid low surrogate");`