Commited178b9

committed

gh-59598: Ignore leading whitespace inJSONDecoder.raw_decode

Whitespace is allowed before JSON objects according to RFC 4627.

1 parentbfc57d4 commited178b9Copy full SHA for ed178b9

File tree

+21

-3

lines changed

+21

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -341,23 +341,27 @@ def decode(self, s, _w=WHITESPACE.match):`
`341`	`341`	`containing a JSON document).`
`342`	`342`
`343`	`343`	`"""`
`344`		`-obj,end=self.raw_decode(s,idx=_w(s,0).end())`
	`344`	`+obj,end=self.raw_decode(s)`
`345`	`345`	`end=_w(s,end).end()`
`346`	`346`	`ifend!=len(s):`
`347`	`347`	`raiseJSONDecodeError("Extra data",s,end)`
`348`	`348`	`returnobj`
`349`	`349`
`350`		`-defraw_decode(self,s,idx=0):`
	`350`	`+defraw_decode(self,s,idx=0,_w=WHITESPACE.match):`
`351`	`351`	"""Decode a JSON document from ``s`` (a ``str`` beginning with
`352`	`352`	`a JSON document) and return a 2-tuple of the Python`
`353`	`353`	representation and the index in ``s`` where the document ended.
	`354`	`+ Whitespace at the beginning of the document will be ignored.`
	`355`	`+`
	`356`	+ Optionally, ``idx`` can be used to specify an offset in ``s``
	`357`	`+ where the document begins.`
`354`	`358`
`355`	`359`	`This can be used to decode a JSON document from a string that may`
`356`	`360`	`have extraneous data at the end.`
`357`	`361`
`358`	`362`	`"""`
`359`	`363`	`try:`
`360`		`-obj,end=self.scan_once(s,idx)`
	`364`	`+obj,end=self.scan_once(s,idx=_w(s,idx).end())`
`361`	`365`	`exceptStopIterationaserr:`
`362`	`366`	`raiseJSONDecodeError("Expecting value",s,err.value)fromNone`
`363`	`367`	`returnobj,end`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,20 @@ def test_limit_int(self):`
`103`	`103`	`withself.assertRaises(ValueError):`
`104`	`104`	`self.loads('1'* (maxdigits+1))`
`105`	`105`
	`106`	`+classTestRawDecode:`
	`107`	`+deftest_whitespace(self):`
	`108`	`+decoder=self.json.JSONDecoder()`
	`109`	`+self.assertEqual(decoder.raw_decode(' {}'), ({},3))`
	`110`	`+self.assertEqual(decoder.raw_decode(' []'), ([],4))`
	`111`	`+self.assertEqual(decoder.raw_decode(' ""'), ('',5))`
	`112`	`+s=' { "key" : "value" , "k":"v" }\n' \`
	`113`	`+' { "key": "value", "k" :"v"} '`
	`114`	`+val1,n1=decoder.raw_decode(s)`
	`115`	`+val2,n2=decoder.raw_decode(s[n1:])`
	`116`	`+self.assertEqual(val1, {"key":"value","k":"v"})`
	`117`	`+self.assertEqual(val2, {"key":"value","k":"v"})`
`106`	`118`
`107`	`119`	`classTestPyDecode(TestDecode,PyTest):pass`
`108`	`120`	`classTestCDecode(TestDecode,CTest):pass`
	`121`	`+classTestPyRawDecode(TestRawDecode,PyTest):pass`
	`122`	`+classTestCRawDecode(TestRawDecode,CTest):pass`

Comments

(0)