734090 - GB18030 decoder maps reserved 4-bytes ranges to random Unicode values

Status: RESOLVED FIXED

(Core :: Internationalization, defect)

Description

[Masatoshi Kimura [:emk]]

Attachment: Added a range check

Comment 1

[Masatoshi Kimura [:emk]]

Attachment: Added a range check

Forgot hg add

Comment 2

[Simon Montagu :smontagu]

Comment on attachment 604072 [details] [diff] [review]
Added a range check

Review of attachment 604072 [details] [diff] [review]:
-----------------------------------------------------------------

::: intl/uconv/ucvcn/nsGBKToUnicode.cpp
@@ +298,5 @@
>    a3 -= (PRUint8)0x81;
>    a4 -= (PRUint8)0x30;
>    PRUint32 idx = (((a1 * 10 + a2 ) * 126 + a3) * 10) + a4;
> +  if (idx > 0x000FFFFF)
> +    return false;

I thought this was a mistake until I realized that idx == ucs4Codepoint - 0x10000. Can you add a comment saying that? r=me with that.

Comment 3

[Masatoshi Kimura [:emk]]

Attachment: patch for check in. r=smontagu

Comment 4

[Mozilla RelEng Bot]

Autoland Patchset:
	Patches: 604207
	Branch: mozilla-central => try
Patch 604207 could not be applied to mozilla-central.
file intl/uconv/tests/unit/test_decode_gb18030.js already exists
1 out of 1 hunks FAILED -- saving rejects to file intl/uconv/tests/unit/test_decode_gb18030.js.rej
abort: patch failed to apply

Patchset could not be applied and pushed.

Comment 5

[Masatoshi Kimura [:emk]]

Pushed to try server manually.
https://tbpl.mozilla.org/?tree=Try&rev=7fb859257698

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c7981774c170

Comment 7

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

https://hg.mozilla.org/mozilla-central/rev/c7981774c170