Title: [152610] trunk/Source/WebCore
Revision
152610
Author
[email protected]
Date
2013-07-13 08:32:07 -0700 (Sat, 13 Jul 2013)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (152609 => 152610)


--- trunk/Source/WebCore/ChangeLog	2013-07-13 03:44:16 UTC (rev 152609)
+++ trunk/Source/WebCore/ChangeLog	2013-07-13 15:32:07 UTC (rev 152610)
@@ -1,3 +1,15 @@
+2013-07-13  Ryosuke Niwa  <[email protected]>
+
+        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  <[email protected]>
 
         [iOS] TextTrackRepresentation not cleared when captions are disabled

Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (152609 => 152610)


--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp	2013-07-13 03:44:16 UTC (rev 152609)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp	2013-07-13 15:32:07 UTC (rev 152610)
@@ -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.characters();
+    const UChar* start = input.characters16();
     return parseHTMLIntegerInternal(start, start + length, value);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to