Commit9da408d

authored

bpo-29990: Fix range checking in GB18030 decoder (#1495)

When decoding a 4-byte GB18030 sequence, the first and third byte cannot exceed 0xFE.

1 parentfa5abac commit9da408dCopy full SHA for 9da408d

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,12 @@ class Test_GB18030(multibytecodec_support.TestBase, unittest.TestCase):`
`48`	`48`	`(b"abc\x84\x32\x80\x80def","replace",'abc\ufffd2\ufffd\ufffddef'),`
`49`	`49`	`(b"abc\x81\x30\x81\x30def","strict",'abc\x80def'),`
`50`	`50`	`(b"abc\x86\x30\x81\x30def","replace",'abc\ufffd0\ufffd0def'),`
	`51`	`+# issue29990`
	`52`	`+ (b"\xff\x30\x81\x30","strict",None),`
	`53`	`+ (b"\x81\x30\xff\x30","strict",None),`
	`54`	`+ (b"abc\x81\x39\xff\x39\xc1\xc4","replace","abc\ufffd\x39\ufffd\x39\u804a"),`
	`55`	`+ (b"abc\xab\x36\xff\x30def","replace",'abc\ufffd\x36\ufffd\x30def'),`
	`56`	`+ (b"abc\xbf\x38\xff\x32\xc1\xc4","ignore","abc\x38\x32\u804a"),`
`51`	`57`	`)`
`52`	`58`	`has_iso10646=True`
`53`	`59`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,8 @@ Extension Modules`
`317`	`317`	`Library`
`318`	`318`	`-------`
`319`	`319`
	`320`	`+- bpo-29990: Fix range checking in GB18030 decoder. Original patch by Ma Lin.`
	`321`	`+`
`320`	`322`	`- bpo-29979: rewrite cgi.parse_multipart, reusing the FieldStorage class and`
`321`	`323`	`making its results consistent with those of FieldStorage for`
`322`	`324`	`multipart/form-data requests. Patch by Pierre Quentel.`

Lines changed: 3 additions & 1 deletion

Comments

(0)