Changeset 114876 in webkit

Timestamp:

Apr 23, 2012 12:47:39 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: Incorrect handling of CSS escape sequences that encode surrogates
​https://bugs.webkit.org/show_bug.cgi?id=76152

Patch by Szilard Ledan <Szilárd LEDÁN> on 2012-04-23
Reviewed by Kent Tamura.

Test: fast/css/parsing-css-surrogate-pairs.html

• css/CSSParser.cpp:

(WebCore::CSSParser::parseEscape):

LayoutTests: Added a test for css surrogate pairs parser
​https://bugs.webkit.org/show_bug.cgi?id=76152

Patch by Szilard Ledan <Szilárd LEDÁN> on 2012-04-23
Reviewed by Kent Tamura.

• fast/css/parsing-css-surrogate-pairs-expected.txt: Added.
• fast/css/parsing-css-surrogate-pairs.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/parsing-css-surrogate-pairs-expected.txt (added)
• LayoutTests/fast/css/parsing-css-surrogate-pairs.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-23  Szilard Ledan  <szledan@inf.u-szeged.hu>
+
+        Added a test for css surrogate pairs parser
+        https://bugs.webkit.org/show_bug.cgi?id=76152
+
+        Reviewed by Kent Tamura.
+
+        * fast/css/parsing-css-surrogate-pairs-expected.txt: Added.
+        * fast/css/parsing-css-surrogate-pairs.html: Added.
+
 2012-04-22  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-23  Szilard Ledan  <szledan@inf.u-szeged.hu>
+
+        Incorrect handling of CSS escape sequences that encode surrogates
+        https://bugs.webkit.org/show_bug.cgi?id=76152
+
+        Reviewed by Kent Tamura.
+
+        Test: fast/css/parsing-css-surrogate-pairs.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseEscape):
+
 2012-04-22  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -7970 +7970 @@
         } while (--length && isASCIIHexDigit(*m_currentCharacter));
 
-        // Characters above 0xffff are not handled.
-        if (unicode > 0xffff)
+        // Characters above 0x10ffff are not handled.
+        if (unicode > 0x10ffff)
             unicode = 0xfffd;
 
@@ -7977 +7977 @@
         if (isHTMLSpace(*m_currentCharacter))
             ++m_currentCharacter;
-        *result = unicode;
+
+        // Replace unicode with a surrogate pairs when it is bigger than 0xffff
+        if (U16_LENGTH(unicode) == 2) {
+            *result++ = U16_LEAD(unicode);
+            *result = U16_TRAIL(unicode);
+        } else
+            *result = unicode;
     } else
         *result = *m_currentCharacter++;