Reject extra chars if strictRoot

cdunn2001 · cdunn2001 · commit 126bdc2b057d · 2016-08-21T20:32:16.000-05:00
resolves #511
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -1068,7 +1068,7 @@ bool OurReader::parse(const char* beginDoc,
   Token token;
   skipCommentTokens(token);
   if (features_.failIfExtra_) {
-    if (token.type_ != tokenError && token.type_ != tokenEndOfStream) {
+    if ((features_.strictRoot_ || token.type_ != tokenError) && token.type_ != tokenEndOfStream) {
       addError("Extra non-whitespace after JSON value.", token);
       return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ bool OurReader::parse(const char* beginDoc,`
`1068`	`1068`	`Token token;`
`1069`	`1069`	`skipCommentTokens(token);`
`1070`	`1070`	`if (features_.failIfExtra_) {`
`1071`		`- if (token.type_ != tokenError && token.type_ != tokenEndOfStream) {`
	`1071`	`+ if ((features_.strictRoot_ \|\| token.type_ != tokenError) && token.type_ != tokenEndOfStream) {`
`1072`	`1072`	`addError("Extra non-whitespace after JSON value.", token);`
`1073`	`1073`	`return false;`
`1074`	`1074`	`}`