Merge pull request #759 from eamonnmcmanus/eofnull · michael-ameri/JSON-java@60662e2 · GitHub

michael-ameri / JSON-java Public

forked from stleary/JSON-java

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 60662e2

Browse filesBrowse the repository at this point in the historyBrowse files

stleary

authored

Merge pull request stleary#759 from eamonnmcmanus/eofnull

JSON parsing should detect embedded `\0` values

2 parents 402db6a + 2a4bc34 commit 60662e2
Copy full SHA for 60662e2

2 files changed

+12Lines changed: 12 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • main/java/org/json
    • JSONObject.java
  • test/java/org/json/junit
    • JSONObjectTest.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/main/java/org/json/JSONObject.java‎

Copy file name to clipboardExpand all lines: src/main/java/org/json/JSONObject.java

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -256,6 +256,9 @@ public JSONObject(JSONTokener x) throws JSONException {
256	256	if (x.nextClean() == '}') {
257	257	return;
258	258	}
	259	+ if (x.end()) {
	260	+ throw x.syntaxError("A JSONObject text must end with '}'");
	261	+ }
259	262	x.back();
260	263	break;
261	264	case '}':

Collapse file

‎src/test/java/org/json/junit/JSONObjectTest.java‎

Copy file name to clipboardExpand all lines: src/test/java/org/json/junit/JSONObjectTest.java

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -2225,6 +2225,15 @@ public void jsonObjectParsingErrors() {
2225	2225	"Expected a ',' or '}' at 15 [character 16 line 1]",
2226	2226	e.getMessage());
2227	2227	}
	2228	+ try {
	2229	+ // \0 after ,
	2230	+ String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
	2231	+ assertNull("Expected an exception",new JSONObject(str));
	2232	+ } catch (JSONException e) {
	2233	+ assertEquals("Expecting an exception message",
	2234	+ "A JSONObject text must end with '}' at 15 [character 16 line 1]",
	2235	+ e.getMessage());
	2236	+ }
2228	2237	try {
2229	2238	// append to wrong key
2230	2239	String str = "{\"myKey\":true, \"myOtherKey\":false}";

0 commit comments

Comments

0 (0)