From dd556ad5cbbec28666b35fe9017abbe348b95688 Mon Sep 17 00:00:00 2001
From: Kasper Jeppe Jeppesen <kasper.jeppesen@gmail.com>
Date: Thu, 20 Apr 2017 16:30:56 -0700
Subject: [PATCH] bugfix string quoting

---
 .../me/doubledutch/lazyjson/LazyArray.java    | 14 ++-
 .../me/doubledutch/lazyjson/LazyElement.java  | 59 +++++++++++++
 .../me/doubledutch/lazyjson/LazyNode.java     | 87 +++++++++++++------
 .../me/doubledutch/lazyjson/LazyObject.java   | 10 ++-
 .../resources/lazyjson_version.properties     |  6 +-
 .../me/doubledutch/lazyjson/ModifyTest.java   | 10 +++
 6 files changed, 153 insertions(+), 33 deletions(-)

diff --git a/src/main/java/me/doubledutch/lazyjson/LazyArray.java b/src/main/java/me/doubledutch/lazyjson/LazyArray.java
index 9f64214..8277520 100644
--- a/src/main/java/me/doubledutch/lazyjson/LazyArray.java
+++ b/src/main/java/me/doubledutch/lazyjson/LazyArray.java
@@ -207,7 +207,12 @@ private void insertChild(int index,LazyNode token) throws LazyException{
 	}
 
 	public LazyArray put(String value) throws LazyException{
-		LazyNode child=appendAndSetDirtyString(LazyNode.VALUE_STRING,value);
+		LazyNode child=null;
+		if(shouldQuoteString(value)){
+			child=appendAndSetDirtyString(LazyNode.VALUE_ESTRING,quoteString(value));
+		}else{
+			child=appendAndSetDirtyString(LazyNode.VALUE_STRING,value);
+		}
 		appendChild(child);
 		return this;
 	}
@@ -279,7 +284,12 @@ public LazyArray put(LazyObject value) throws LazyException{
 	}
 
 	public LazyArray put(int index,String value) throws LazyException{
-		LazyNode child=appendAndSetDirtyString(LazyNode.VALUE_STRING,value);
+		LazyNode child=null;
+		if(shouldQuoteString(value)){
+			child=appendAndSetDirtyString(LazyNode.VALUE_ESTRING,quoteString(value));
+		}else{
+			child=appendAndSetDirtyString(LazyNode.VALUE_STRING,value);
+		}
 		insertChild(index,child);
 		return this;
 	}
diff --git a/src/main/java/me/doubledutch/lazyjson/LazyElement.java b/src/main/java/me/doubledutch/lazyjson/LazyElement.java
index 39ea5f7..7a48ffc 100644
--- a/src/main/java/me/doubledutch/lazyjson/LazyElement.java
+++ b/src/main/java/me/doubledutch/lazyjson/LazyElement.java
@@ -83,6 +83,65 @@ public static LazyElement parse(String str) throws LazyException{
 		throw new LazyException("The given string is not a JSON object or array");
 	}
 
+	protected static boolean shouldQuoteString(String str){
+		boolean found=false;
+		int length=str.length();
+		char[] cbuf=new char[length];
+		str.getChars(0,length,cbuf,0);
+		for(int i=0;i<length;i++){
+			char c=cbuf[i];
+			if(c=='\\' || c=='"' || c=='\b' || c=='\t' || c=='\n' || c=='\f' || c=='\r'){// || c<' ' || (c>= '\u0080' && c<'\u00a0') || (c>='\u2000' && c<'\u2100')){
+				found=true;
+			}
+		}
+		return found;
+	}
+
+	protected static String quoteString(String str){
+		StringBuffer buf=new StringBuffer();
+		int length=str.length();
+		char[] cbuf=new char[length];
+		str.getChars(0,length,cbuf,0);
+		
+        for(int i=0; i<length; i++){
+        	char c=cbuf[i];
+            switch(c){
+            	case '\\':
+            		buf.append("\\\\");
+            		break;
+            	case '"':
+                	buf.append('\\');
+                	buf.append(c);
+                	break;
+	            case '\b':
+	                buf.append("\\b");
+	                break;
+	            case '\t':
+	                buf.append("\\t");
+	                break;
+	            case '\n':
+	                buf.append("\\n");
+	                break;
+	            case '\f':
+	                buf.append("\\f");
+	                break;
+	            case '\r':
+	                buf.append("\\r");
+	                break;
+	            default:
+	                /*
+					We shouldn't need to encode special characters other than the above, all others should be handled by utf-8 encoding
+	                if(c<' ' || (c>= '\u0080' && c<'\u00a0') || (c>='\u2000' && c<'\u2100')){
+	                    String tmp="000"+Integer.toHexString(c);
+	                    buf.append("\\u"+tmp.substring(tmp.length()-4));
+	                }else{*/
+	                   buf.append(c);
+	                //}
+	        }
+	    }
+        return buf.toString();
+	}
+
 	public static LazyElement readFromTemplate(Template t,ByteBuffer buf,DictionaryCache dict) throws LazyException{
 		String str=t.read(buf,dict);
 		// System.out.println(str);
diff --git a/src/main/java/me/doubledutch/lazyjson/LazyNode.java b/src/main/java/me/doubledutch/lazyjson/LazyNode.java
index 2f01e03..a7e8499 100644
--- a/src/main/java/me/doubledutch/lazyjson/LazyNode.java
+++ b/src/main/java/me/doubledutch/lazyjson/LazyNode.java
@@ -346,38 +346,71 @@ protected String getStringValue(char[] source,StringBuilder dirtyBuf){
 			return new String(source,startIndex,endIndex-startIndex);
 		}else{
 			StringBuilder buf=new StringBuilder(endIndex-startIndex);
-			for(int i=startIndex;i<endIndex;i++){
-				char c=source[i];
-				if(c=='\\'){
-					i++;
-					c=source[i];
-					if(c=='"' || c=='\\' || c=='/'){
+			if(dirty){
+				for(int i=startIndex;i<endIndex;i++){
+					char c=dirtyBuf.charAt(i);
+					if(c=='\\'){
+						i++;
+						c=dirtyBuf.charAt(i);
+						if(c=='"' || c=='\\' || c=='/'){
+							buf.append(c);
+						}else if(c=='b'){
+							buf.append('\b');
+						}else if(c=='f'){
+							buf.append('\f');
+						}else if(c=='n'){
+							buf.append('\n');
+						}else if(c=='r'){
+							buf.append('\r');
+						}else if(c=='t'){
+							buf.append('\t');
+						}else if(c=='u'){
+							String code=dirtyBuf.substring(i+1,i+5);
+							buf.append((char)Integer.parseInt(code, 16));
+							i+=4;
+						}
+					}else{
+						buf.append(c);
+					}
+				}
+			}else{
+				for(int i=startIndex;i<endIndex;i++){
+					char c=source[i];
+					if(c=='\\'){
+						i++;
+						c=source[i];
+						if(c=='"' || c=='\\' || c=='/'){
+							buf.append(c);
+						}else if(c=='b'){
+							buf.append('\b');
+						}else if(c=='f'){
+							buf.append('\f');
+						}else if(c=='n'){
+							buf.append('\n');
+						}else if(c=='r'){
+							buf.append('\r');
+						}else if(c=='t'){
+							buf.append('\t');
+						}else if(c=='u'){
+							String code=new String(source,i+1,4);
+							buf.append((char)Integer.parseInt(code, 16));
+							i+=4;
+						}
+					}else{
 						buf.append(c);
-					}else if(c=='b'){
-						buf.append('\b');
-					}else if(c=='f'){
-						buf.append('\f');
-					}else if(c=='n'){
-						buf.append('\n');
-					}else if(c=='r'){
-						buf.append('\r');
-					}else if(c=='t'){
-						buf.append('\t');
-					}else if(c=='u'){
-						String code=new String(source,i+1,4);
-						buf.append((char)Integer.parseInt(code, 16));
-						i+=4;
 					}
-				}else{
-					buf.append(c);
 				}
 			}
 			return buf.toString();
 		}
 	}
 
-	private String getRawStringValue(char[] source){
-		return new String(source,startIndex,endIndex-startIndex);
+	protected String getRawStringValue(char[] source,StringBuilder dirtyBuf){
+		if(dirty){
+			return dirtyBuf.substring(startIndex,endIndex);
+		}else{
+			return new String(source,startIndex,endIndex-startIndex);
+		}
 	}
 
 	/**
@@ -464,7 +497,11 @@ private void addCommaSeparatedChildren(char[] cbuf,Template template){
 	}
 
 	private String getFieldString(char[] cbuf){
-		return "\""+getRawStringValue(cbuf)+"\":";
+		return "\""+getRawStringValue(cbuf,null)+"\":";
+	}
+
+	private String getFieldString(char[] cbuf,StringBuilder dirtyBuf){
+		return "\""+getRawStringValue(cbuf,dirtyBuf)+"\":";
 	}
 
 	private void putString(char[] cbuf,ByteBuffer buf,DictionaryCache dict){
diff --git a/src/main/java/me/doubledutch/lazyjson/LazyObject.java b/src/main/java/me/doubledutch/lazyjson/LazyObject.java
index db8f3b9..1bd7d3d 100644
--- a/src/main/java/me/doubledutch/lazyjson/LazyObject.java
+++ b/src/main/java/me/doubledutch/lazyjson/LazyObject.java
@@ -155,7 +155,7 @@ protected String serializeElementToString(){
 				buf.append(new LazyArray(pointer.child,cbuf,dirtyBuf).toString());
 			}else if(pointer.child.type==LazyNode.VALUE_STRING || pointer.child.type==LazyNode.VALUE_ESTRING){
 				buf.append("\"");
-				buf.append(pointer.child.getStringValue(cbuf,dirtyBuf));
+				buf.append(pointer.child.getRawStringValue(cbuf,dirtyBuf));
 				buf.append("\"");
 			}else if(pointer.child.type==LazyNode.VALUE_TRUE){
 				buf.append("true");
@@ -196,8 +196,12 @@ private void attachField(String key,LazyNode child) throws LazyException{
 	}
 
 	public LazyObject put(String key,String value) throws LazyException{
-		// TODO: correctly detect and encode string values
-		LazyNode child=appendAndSetDirtyString(LazyNode.VALUE_STRING,value);
+		LazyNode child=null;
+		if(shouldQuoteString(value)){
+			child=appendAndSetDirtyString(LazyNode.VALUE_ESTRING,quoteString(value));
+		}else{
+			child=appendAndSetDirtyString(LazyNode.VALUE_STRING,value);
+		}
 		attachField(key,child);
 		return this;
 	}
diff --git a/src/main/resources/lazyjson_version.properties b/src/main/resources/lazyjson_version.properties
index 12ee17a..a3caec3 100644
--- a/src/main/resources/lazyjson_version.properties
+++ b/src/main/resources/lazyjson_version.properties
@@ -1,4 +1,4 @@
-#Thu Apr 20 15:00:53 PDT 2017
+#Thu Apr 20 16:23:24 PDT 2017
 BUILD_VERSION=2.0.0
-BUILD_DATE=2017-04-20T22\:00\:53Z
-BUILD_NUMBER=900
+BUILD_DATE=2017-04-20T23\:23\:24Z
+BUILD_NUMBER=937
diff --git a/src/test/java/me/doubledutch/lazyjson/ModifyTest.java b/src/test/java/me/doubledutch/lazyjson/ModifyTest.java
index b4c7db7..f7b76e2 100644
--- a/src/test/java/me/doubledutch/lazyjson/ModifyTest.java
+++ b/src/test/java/me/doubledutch/lazyjson/ModifyTest.java
@@ -27,6 +27,16 @@ public void addStringTest() throws LazyException{
 		assertEquals(obj.toString(),"{\"foo\":\"bar\",\"baz\":42,\"test\":\"Hello World\"}");
     }
 
+    @Test
+    public void addComplexStringTest() throws LazyException{
+        String str="{\"foo\":\"bar\",\"baz\":42}";
+        LazyObject obj=new LazyObject(str);
+		obj.put("test","Hello \n\t\r\b\"\\\f World");
+		assertEquals(obj.getString("test"),"Hello \n\t\r\b\"\\\f World");
+		assertEquals(obj.getString("foo"),"bar");
+		assertEquals(obj.toString(),"{\"foo\":\"bar\",\"baz\":42,\"test\":\"Hello \\n\\t\\r\\b\\\"\\\\\\f World\"}");
+    }
+
     @Test
     public void buildObjectTest() throws LazyException{
         LazyObject obj=new LazyObject();