test skip string in streaming mode

taowen · taowen · commit 932fb23f9b3a · 2017-01-21T14:46:48.000+08:00
diff --git a/src/main/java/com/jsoniter/IterImplArray.java b/src/main/java/com/jsoniter/IterImplArray.java
@@ -34,8 +34,7 @@ public static final boolean readArrayCB(final JsonIterator iter, JsonIterator.Re
                 if (!callback.handle(iter)) {
                     return false;
                 }
-                c = IterImpl.nextToken(iter);
-                while (c == ',') {
+                while (IterImpl.nextToken(iter) == ',') {
                     if (!callback.handle(iter)) {
                         return false;
                     }
diff --git a/src/main/java/com/jsoniter/IterImplForStreaming.java b/src/main/java/com/jsoniter/IterImplForStreaming.java
@@ -125,7 +125,10 @@ final static void skipString(JsonIterator iter) throws IOException {
             if (end == -1) {
                 int j = iter.tail - 1;
                 boolean escaped = true;
+                // can not just look the last byte is \
+                // because it could be \\ or \\\
                 for (; ; ) {
+                    // walk backward until head
                     if (j < iter.head || iter.buf[j] != '\\') {
                         // even number of backslashes
                         // either end of buffer, or " found
@@ -142,10 +145,10 @@ final static void skipString(JsonIterator iter) throws IOException {
 
                 }
                 if (!loadMore(iter)) {
-                    return;
+                    throw iter.reportError("skipString", "incomplete string");
                 }
                 if (escaped) {
-                    iter.head = 1; // skip the first char as last char readAny is \
+                    iter.head = 1; // skip the first char as last char is \
                 }
             } else {
                 iter.head = end;
diff --git a/src/test/java/com/jsoniter/TestSkip.java b/src/test/java/com/jsoniter/TestSkip.java
@@ -1,7 +1,10 @@
 package com.jsoniter;
 
+import com.jsoniter.spi.JsonException;
 import junit.framework.TestCase;
+import org.junit.experimental.categories.Category;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
 public class TestSkip extends TestCase {
@@ -24,6 +27,27 @@ public void test_skip_string() throws IOException {
         assertFalse(iter.readArray());
     }
 
+    @Category(StreamingCategory.class)
+    public void test_skip_string_streaming() throws IOException {
+        JsonIterator iter = JsonIterator.parse(new ByteArrayInputStream("\"hello".getBytes()), 2);
+        try {
+            iter.skip();
+            fail();
+        } catch (JsonException e) {
+        }
+        iter = JsonIterator.parse(new ByteArrayInputStream("\"hello\"".getBytes()), 2);
+        iter.skip();
+        iter = JsonIterator.parse(new ByteArrayInputStream("\"hello\"1".getBytes()), 2);
+        iter.skip();
+        assertEquals(1, iter.readInt());
+        iter = JsonIterator.parse(new ByteArrayInputStream("\"h\\\"ello\"1".getBytes()), 3);
+        iter.skip();
+        assertEquals(1, iter.readInt());
+        iter = JsonIterator.parse(new ByteArrayInputStream("\"\\\\\"1".getBytes()), 3);
+        iter.skip();
+        assertEquals(1, iter.readInt());
+    }
+
     public void test_skip_object() throws IOException {
         JsonIterator iter = JsonIterator.parse("[{'hello': {'world': 'a'}},2]".replace('\'', '"'));
         assertTrue(iter.readArray());

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ public static final boolean readArrayCB(final JsonIterator iter, JsonIterator.Re`
`34`	`34`	`if (!callback.handle(iter)) {`
`35`	`35`	`return false;`
`36`	`36`	`}`
`37`		`- c = IterImpl.nextToken(iter);`
`38`		`- while (c == ',') {`
	`37`	`+ while (IterImpl.nextToken(iter) == ',') {`
`39`	`38`	`if (!callback.handle(iter)) {`
`40`	`39`	`return false;`
`41`	`40`	`}`