From: rniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat, 13 Jul 2013 15:32:07 +0000 (+0000)
Subject: parseHTMLInteger shouldn't upconvert 8-bit string
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=87eabb296068215e2d6fa55829343f7854db2934

parseHTMLInteger shouldn't upconvert 8-bit string
https://bugs.webkit.org/show_bug.cgi?id=118629

Reviewed by Sam Weinig.

Merge https://chromium.googlesource.com/chromium/blink/+/e0ebab23e0c16b49dc90c9c39b8bbbf4f243a01e.

* html/parser/HTMLParserIdioms.cpp:
(WebCore::parseHTMLInteger):


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4894253de719..ee5e109d7777 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        parseHTMLInteger shouldn't upconvert 8-bit string
+        https://bugs.webkit.org/show_bug.cgi?id=118629
+
+        Reviewed by Sam Weinig.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/e0ebab23e0c16b49dc90c9c39b8bbbf4f243a01e.
+
+        * html/parser/HTMLParserIdioms.cpp:
+        (WebCore::parseHTMLInteger):
+
 2013-07-12  Eric Carlson  <eric.carlson@apple.com>
 
         [iOS] TextTrackRepresentation not cleared when captions are disabled
diff --git a/Source/WebCore/html/parser/HTMLParserIdioms.cpp b/Source/WebCore/html/parser/HTMLParserIdioms.cpp
index 09ec68bddfd8..e10a5cdecf87 100644
--- a/Source/WebCore/html/parser/HTMLParserIdioms.cpp
+++ b/Source/WebCore/html/parser/HTMLParserIdioms.cpp
@@ -207,12 +207,12 @@ bool parseHTMLInteger(const String& input, int& value)
     // 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.characters();
+    const UChar* start = input.characters16();
     return parseHTMLIntegerInternal(start, start + length, value);
 }