118629 2013-07-12 17:08:47 -0700 parseHTMLInteger shouldn't upconvert 8-bit string 2013-07-13 08:33:06 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 118641 1 rniwa rniwa barraclough benjamin commit-queue darin esprehn+autocc ggaren msaboff oldest_to_newest 908107 0 rniwa 2013-07-12 17:08:47 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/e0ebab23e0c16b49dc90c9c39b8bbbf4f243a01e --- a/Source/core/html/parser/HTMLParserIdioms.cpp +++ b/Source/core/html/parser/HTMLParserIdioms.cpp @@ -207,12 +207,12 @@ // Step 1 // Step 2 unsigned length = input.length(); - if (length && input.is8Bit()) { + if (!length || input.is8Bit()) { const LChar* start = input.characters8(); return parseHTMLIntegerInternal(start, start + length, value); } - const UChar* start = input.bloatedCharacters(); + const UChar* start = input.characters16(); return parseHTMLIntegerInternal(start, start + length, value); } 908109 1 206582 rniwa 2013-07-12 18:49:35 -0700 Created attachment 206582 Fixes the bug 908175 2 206582 commit-queue 2013-07-13 08:33:04 -0700 Comment on attachment 206582 Fixes the bug Clearing flags on attachment: 206582 Committed r152610: <http://trac.webkit.org/changeset/152610> 908176 3 commit-queue 2013-07-13 08:33:06 -0700 All reviewed patches have been landed. Closing bug. 206582 2013-07-12 18:49:35 -0700 2013-07-13 08:33:04 -0700 Fixes the bug bug-118629-20130712184718.patch text/plain 1505 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjYwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA3LTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIHBhcnNlSFRNTEludGVnZXIgc2hv dWxkbid0IHVwY29udmVydCA4LWJpdCBzdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODYyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNl LmNvbS9jaHJvbWl1bS9ibGluay8rL2UwZWJhYjIzZTBjMTZiNDlkYzkwYzljMzliOGJiYmY0ZjI0 M2EwMWUuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlSFRNTEludGVnZXIpOgorCiAyMDEzLTA3LTEyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFRleHRUcmFj a1JlcHJlc2VudGF0aW9uIG5vdCBjbGVhcmVkIHdoZW4gY2FwdGlvbnMgYXJlIGRpc2FibGVkCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNw cAkocmV2aXNpb24gMTUyNjA1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBh cnNlcklkaW9tcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNywxMiArMjA3LDEyIEBAIGJvb2wg cGFyc2VIVE1MSW50ZWdlcihjb25zdCBTdHJpbmcmIGlucHUKICAgICAvLyBTdGVwIDEKICAgICAv LyBTdGVwIDIKICAgICB1bnNpZ25lZCBsZW5ndGggPSBpbnB1dC5sZW5ndGgoKTsKLSAgICBpZiAo bGVuZ3RoICYmIGlucHV0LmlzOEJpdCgpKSB7CisgICAgaWYgKCFsZW5ndGggfHwgaW5wdXQuaXM4 Qml0KCkpIHsKICAgICAgICAgY29uc3QgTENoYXIqIHN0YXJ0ID0gaW5wdXQuY2hhcmFjdGVyczgo KTsKICAgICAgICAgcmV0dXJuIHBhcnNlSFRNTEludGVnZXJJbnRlcm5hbChzdGFydCwgc3RhcnQg KyBsZW5ndGgsIHZhbHVlKTsKICAgICB9CiAKLSAgICBjb25zdCBVQ2hhciogc3RhcnQgPSBpbnB1 dC5jaGFyYWN0ZXJzKCk7CisgICAgY29uc3QgVUNoYXIqIHN0YXJ0ID0gaW5wdXQuY2hhcmFjdGVy czE2KCk7CiAgICAgcmV0dXJuIHBhcnNlSFRNTEludGVnZXJJbnRlcm5hbChzdGFydCwgc3RhcnQg KyBsZW5ndGgsIHZhbHVlKTsKIH0KIAo=