GODRIVER-1502 Fix variable shadowing in parsing (#332)

Divjot Arora · web-flow · commit 32aba96df4f5 · 2020-03-13T16:52:11.000-04:00
diff --git a/bson/bsonrw/extjson_parser.go b/bson/bsonrw/extjson_parser.go
@@ -118,8 +118,7 @@ func (ejp *extJSONParser) peekType() (bsontype.Type, error) {
 			switch t {
 			case bsontype.JavaScript:
 				// just saw $code, need to check for $scope at same level
-				_, err := ejp.readValue(bsontype.JavaScript)
-
+				_, err = ejp.readValue(bsontype.JavaScript)
 				if err != nil {
 					break
 				}
@@ -128,6 +127,7 @@ func (ejp *extJSONParser) peekType() (bsontype.Type, error) {
 				case jpsSawEndObject: // type is TypeJavaScript
 				case jpsSawComma:
 					ejp.advanceState()
+
 					if ejp.s == jpsSawKey && ejp.k == "$scope" {
 						t = bsontype.CodeWithScope
 					} else {
diff --git a/bson/bsonrw/extjson_parser_test.go b/bson/bsonrw/extjson_parser_test.go
@@ -148,6 +148,8 @@ func TestExtJSONParserPeekType(t *testing.T) {
 			errFs: []expectedErrorFunc{expectNoError, expectError},
 		},
 		makeInvalidTestCase("lone $scope", `{"$scope": {}}`, expectError),
+		makeInvalidTestCase("empty code with unknown extra key", `{"$code":"", "0":""}`, expectError),
+		makeInvalidTestCase("non-empty code with unknown extra key", `{"$code":"foobar", "0":""}`, expectError),
 	}
 
 	for _, tc := range cases {

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,8 @@ func TestExtJSONParserPeekType(t *testing.T) {`
`148`	`148`	`errFs: []expectedErrorFunc{expectNoError, expectError},`
`149`	`149`	`},`
`150`	`150`	makeInvalidTestCase("lone $scope", `{"$scope": {}}`, expectError),
	`151`	+ makeInvalidTestCase("empty code with unknown extra key", `{"$code":"", "0":""}`, expectError),
	`152`	+ makeInvalidTestCase("non-empty code with unknown extra key", `{"$code":"foobar", "0":""}`, expectError),
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`for _, tc := range cases {`