fix #112 #119

Author: taowen

src/main/java/com/jsoniter/IterImpl.java

@@ -210,6 +210,7 @@ public final static boolean loadMore(JsonIterator iter) throws IOException {
 
     public final static int readStringSlowPath(JsonIterator iter, int j) throws IOException {
         try {
+            boolean isExpectingLowSurrogate = false;
             for (int i = iter.head; i < iter.tail; ) {
                 int bc = iter.buf[i++];
                 if (bc == '"') {
@@ -243,6 +244,23 @@ public final static int readStringSlowPath(JsonIterator iter, int j) throws IOEx
                                     (IterImplString.translateHex(iter.buf[i++]) << 8) +
                                     (IterImplString.translateHex(iter.buf[i++]) << 4) +
                                     IterImplString.translateHex(iter.buf[i++]);
+                            if (Character.isHighSurrogate((char) bc)) {
+                                if (isExpectingLowSurrogate) {
+                                    throw new JsonException("invalid surrogate");
+                                } else {
+                                    isExpectingLowSurrogate = true;
+                                }
+                            } else if (Character.isLowSurrogate((char) bc)) {
+                                if (isExpectingLowSurrogate) {
+                                    isExpectingLowSurrogate = false;
+                                } else {
+                                    throw new JsonException("invalid surrogate");
+                                }
+                            } else {
+                                if (isExpectingLowSurrogate) {
+                                    throw new JsonException("invalid surrogate");
+                                }
+                            }
                             break;
 
                         default:

src/main/java/com/jsoniter/IterImplForStreaming.java

@@ -1,6 +1,7 @@
 package com.jsoniter;
 
 import com.jsoniter.any.Any;
+import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.Slice;
 
 import java.io.IOException;
@@ -382,6 +383,7 @@ public static int updateStringCopyBound(final JsonIterator iter, final int bound
     }
 
     public final static int readStringSlowPath(JsonIterator iter, int j) throws IOException {
+        boolean isExpectingLowSurrogate = false;
         for (;;) {
             int bc = readByte(iter);
             if (bc == '"') {
@@ -414,6 +416,23 @@ public final static int readStringSlowPath(JsonIterator iter, int j) throws IOEx
                                 (IterImplString.translateHex(readByte(iter)) << 8) +
                                 (IterImplString.translateHex(readByte(iter)) << 4) +
                                 IterImplString.translateHex(readByte(iter));
+                        if (Character.isHighSurrogate((char) bc)) {
+                            if (isExpectingLowSurrogate) {
+                                throw new JsonException("invalid surrogate");
+                            } else {
+                                isExpectingLowSurrogate = true;
+                            }
+                        } else if (Character.isLowSurrogate((char) bc)) {
+                            if (isExpectingLowSurrogate) {
+                                isExpectingLowSurrogate = false;
+                            } else {
+                                throw new JsonException("invalid surrogate");
+                            }
+                        } else {
+                            if (isExpectingLowSurrogate) {
+                                throw new JsonException("invalid surrogate");
+                            }
+                        }
                         break;
 
                     default:

src/test/java/com/jsoniter/TestString.java

@@ -1,11 +1,13 @@
 package com.jsoniter;
 
 import com.jsoniter.spi.JsonException;
+import joptsimple.internal.Strings;
 import junit.framework.TestCase;
 import org.junit.experimental.categories.Category;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.Arrays;
 
 public class TestString extends TestCase {
 
@@ -95,6 +97,26 @@ public void test_incomplete_string() throws IOException {
         }
     }
 
+    public void test_invalid_string() throws IOException {
+        for (String str : new String[]{
+                "\"\\x0008\"",
+                "\"\\u000Z\"",
+                "\"\\u000\"",
+                "\"\\u00\"",
+                "\"\\u0\"",
+                "\"\\\"",
+                "\"\\udd1e\"",
+                "\"\\ud834\"",
+                "\"\\ud834\\x\"",
+                "\"\\ud834\\ud834\"",
+        }) {
+            try {JsonIterator.deserialize(str, String.class);
+            } catch (JsonException e) {
+            } catch (IndexOutOfBoundsException e) {
+            }
+        }
+    }
+
     public void test_long_string() throws IOException {
         JsonIterator iter = JsonIterator.parse("\"[\\\"LL\\\",\\\"MM\\\\\\/LW\\\",\\\"JY\\\",\\\"S\\\",\\\"C\\\",\\\"IN\\\",\\\"ME \\\\\\/ LE\\\"]\"");
         assertEquals("[\"LL\",\"MM\\/LW\",\"JY\",\"S\",\"C\",\"IN\",\"ME \\/ LE\"]", iter.readString());