Enhanced logic to skip escaped characters neuecc#63, neuecc#121

AlexeyVoid · Mar 16, 2020 · 50abb9b · 50abb9b
1 parent 608cf01
commit 50abb9b
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/src/Utf8Json/JsonReader.cs b/src/Utf8Json/JsonReader.cs
@@ -767,18 +767,19 @@ public ArraySegment<byte> ReadStringSegmentRaw()
 
                 for (int i = offset; i < bytes.Length; i++)
                 {
-                    if (bytes[i] == (char)'\"')
+                    if (bytes[i] == (char)'\\')
                     {
-                        // is escape?
-                        if (bytes[i - 1] == (char)'\\')
+                        i++; // skip escaped chars
+                        if (bytes[i] == (char)'u') // unicode escape
                         {
-                            continue;
-                        }
-                        else
-                        {
-                            offset = i + 1;
-                            goto OK;
+                            i += 4;
                         }
+                        continue;
+                    }
+                    if (bytes[i] == (char)'\"')
+                    {
+                        offset = i + 1;
+                        goto OK;
                     }
                 }
                 throw CreateParsingExceptionMessage("not found end string.");
@@ -996,18 +997,19 @@ void ReadNextCore(JsonToken token)
                     offset += 1; // position is "\"";
                     for (int i = offset; i < bytes.Length; i++)
                     {
-                        if (bytes[i] == (char)'\"')
+                        if (bytes[i] == (char)'\\')
                         {
-                            // is escape?
-                            if (bytes[i - 1] == (char)'\\')
+                            i++; // skip escaped chars
+                            if (bytes[i] == (char)'u') // unicode escape
                             {
-                                continue;
-                            }
-                            else
-                            {
-                                offset = i + 1;
-                                return; // end
+                                i+=4;
                             }
+                            continue;
+                        }
+                        if (bytes[i] == (char)'\"')
+                        {
+                            offset = i + 1;
+                            return; // end
                         }
                     }
                     throw CreateParsingExceptionMessage("not found end string.");