Commit e902c19c0e2bf7f0e9bc83b2c58d19ec024d56db | zig

author	Matthew Borkowski <matthew.h.borkowski@gmail.com> 2021-05-13 05:11:28-04:00
committer	GitHub <noreply@github.com> 2021-05-13 11:11:28+02:00
log	e902c19c0e2bf7f0e9bc83b2c58d19ec024d56db
tree	de1f648b1339d0c01e799d9d40e7fb602b282b8a
parent	4f71852c103f8dbf6ce78b36e5abd41a0c4ccf06
signature	Signed by PGP key 4AEE18F83AFDEB23

return error from StreamingParser when reading closing brace when expecting value for an object key

2 files changed, 14 insertions(+), 1 deletions(-)

lib/std/json.zig+8-1

 @@ -623,7 +623,7 @@ pub const StreamingParser = struct {
             .ObjectSeparator => switch (c) {
                 ':' => {
-                    p.state = .ValueBegin;
+                    p.state = .ValueBeginNoClosing;
                     p.after_string_state = .ValueEnd;
                 },
                 0x09, 0x0A, 0x0D, 0x20 => {
 @@ -1205,6 +1205,13 @@ test "json.token mismatched close" {
     try testing.expectError(error.UnexpectedClosingBrace, p.next());
 }
+test "json.token premature object close" {
+    var p = TokenStream.init("{ \"key\": }");
+    try checkNext(&p, .ObjectBegin);
+    try checkNext(&p, .String);
+    try testing.expectError(error.InvalidValueBegin, p.next());
+}
 /// Validate a JSON string. This does not limit number precision so a decoder may not necessarily
 /// be able to decode the string even if this returns true.
 pub fn validate(s: []const u8) bool {

lib/std/json/test.zig+6

...	@@ -76,6 +76,12 @@ test "y_trailing_comma_after_empty" {	...	@@ -76,6 +76,12 @@ test "y_trailing_comma_after_empty" {
76	);	76	);
77	}	77	}
78		78
		79	test "n_object_closed_missing_value" {
		80	try err(
		81	\\{"a":}
		82	);
		83	}
		84
79	////////////////////////////////////////////////////////////////////////////////////////////////////	85	////////////////////////////////////////////////////////////////////////////////////////////////////
80		86
81	test "y_array_arraysWithSpaces" {	87	test "y_array_arraysWithSpaces" {