Ensure that end of __ref map is consumed by JSON decoder

lyraproj · Mar 5, 2020 · a7812d7 · a7812d7
1 parent 0505576
commit a7812d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/streamer/json.go b/streamer/json.go
@@ -98,6 +98,9 @@ func (j *jsonDecoder) decodeCollection(delim json.Delim) {
 			if n, ok := j.nextToken().(json.Number); ok {
 				if ri, err := n.Int64(); err == nil {
 					j.consumer.AddRef(int(ri))
+					if j.nextToken() != json.Delim('}') {
+						panic(fmt.Errorf(`expected end of object after "%s": %d`, j.refKey, ri))
+					}
 					return
 				}
 			}

diff --git a/streamer/json_test.go b/streamer/json_test.go
@@ -70,9 +70,9 @@ func TestJSON_ComplexKeys(t *testing.T) {
 
 func TestUnmarshalJSON_ref(t *testing.T) {
 	v := streamer.UnmarshalJSON(
-		[]byte(`{"x": {"z": ["a","b"]}, "y": {"__ref":6}}`),
+		[]byte(`[{"x":"xxxxxxxxxxxxxxxxxxxxx","y":{"__ref":3}}]`),
 		streamer.DgoDialect())
-	require.Equal(t, vf.Map(`x`, vf.Map(`z`, vf.Values("a", `b`)), `y`, `b`), v)
+	require.Equal(t, vf.Values(vf.Map(`x`, `xxxxxxxxxxxxxxxxxxxxx`, `y`, `xxxxxxxxxxxxxxxxxxxxx`)), v)
 }
 
 func TestUnmarshalJSON_refBad(t *testing.T) {
@@ -81,6 +81,12 @@ func TestUnmarshalJSON_refBad(t *testing.T) {
 	}, `expected integer after key "__ref"`)
 }
 
+func TestUnmarshalJSON_refSuperfluous(t *testing.T) {
+	require.Panic(t, func() {
+		streamer.UnmarshalJSON([]byte(`{"x": {"z": ["a","b"]}, "y": {"__ref":6, "x": 1}}`), streamer.DgoDialect())
+	}, `expected end of object after "__ref": 6`)
+}
+
 func TestUnmarshalJSON_badDelim(t *testing.T) {
 	require.Panic(t, func() {
 		streamer.UnmarshalJSON([]byte(``), streamer.DgoDialect())