bug fixed for \u001A serialize, fixed issue 304. alibaba#304

Be-Secure · Apr 13, 2016 · fc56dca · fc56dca
1 parent c25af86
commit fc56dca
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 0 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java b/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java
@@ -856,6 +856,10 @@ public final void scanString() {
             }
 
             if (ch == EOI) {
+                if (!isEOF()) {
+                    putChar((char) EOI);
+                    continue;
+                }
                 throw new JSONException("unclosed string : " + ch);
             }
 
@@ -2639,6 +2643,10 @@ private void scanStringSingleQuote() {
             }
 
             if (chLocal == EOI) {
+                if (!isEOF()) {
+                    putChar((char) EOI);
+                    continue;
+                }
                 throw new JSONException("unclosed single-quote string");
             }
 

diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_304.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_304.java
@@ -0,0 +1,43 @@
+package com.alibaba.json.bvt.bug;
+
+import org.junit.Assert;
+
+import com.alibaba.fastjson.JSON;
+
+import junit.framework.TestCase;
+
+public class Bug_for_issue_304 extends TestCase {
+
+    public void test_doubleQuote() throws Exception {
+        String ss = "{\"value\":\"Intki_E96?\u001A Build\"}";
+        Assert.assertEquals("Intki_E96?\u001A Build", JSON.parseObject(ss).get("value"));
+    }
+
+    public void test_doubleQuote_vo() throws Exception {
+        String ss = "{\"value\":\"Intki_E96?\u001A Build\"}";
+        Assert.assertEquals("Intki_E96?\u001A Build", JSON.parseObject(ss, VO.class).value);
+    }
+
+    public void test_doubleQuote_vo_private() throws Exception {
+        String ss = "{\"value\":\"Intki_E96?\u001A Build\"}";
+        Assert.assertEquals("Intki_E96?\u001A Build", JSON.parseObject(ss, V1.class).value);
+    }
+
+    public void test_singleQuote() throws Exception {
+        String ss = "{'value':'Intki_E96?\u001A Build'}";
+        Assert.assertEquals("Intki_E96?\u001A Build", JSON.parseObject(ss).get("value"));
+    }
+
+    public void test_singleQuote_vo() throws Exception {
+        String ss = "{'value':'Intki_E96?\u001A Build'}";
+        Assert.assertEquals("Intki_E96?\u001A Build", JSON.parseObject(ss, VO.class).value);
+    }
+
+    public static class VO {
+        public String value;
+    }
+
+    private static class V1 {
+        public String value;
+    }
+}