Changeset 63016 in webkit

Timestamp:

Jul 9, 2010 5:34:12 PM (14 years ago)

Author:

kbr@google.com

Message:

2010-07-09 Kenneth Russell <​kbr@google.com>

Reviewed by Dimitri Glazkov.

Assertion failure in String::utf8() for certain invalid UTF16 inputs
​https://bugs.webkit.org/show_bug.cgi?id=41983

• wtf/text/WTFString.cpp: (WebCore::String::utf8):
  • Fixed assertion when sourceExhausted is returned from convertUTF16ToUTF8.

2010-07-09 Kenneth Russell <​kbr@google.com>

Reviewed by Dimitri Glazkov.

Assertion failure in String::utf8() for certain invalid UTF16 inputs
​https://bugs.webkit.org/show_bug.cgi?id=41983

• fast/canvas/webgl/invalid-UTF-16-expected.txt: Added.
• fast/canvas/webgl/invalid-UTF-16.html: Added.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/text/WTFString.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/invalid-UTF-16-expected.txt (added)
• LayoutTests/fast/canvas/webgl/invalid-UTF-16.html (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-09  Kenneth Russell  <kbr@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Assertion failure in String::utf8() for certain invalid UTF16 inputs
+        https://bugs.webkit.org/show_bug.cgi?id=41983
+
+        * wtf/text/WTFString.cpp:
+        (WebCore::String::utf8):
+         - Fixed assertion when sourceExhausted is returned from convertUTF16ToUTF8.
+
 2010-07-09  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -664 +664 @@
     if (result == sourceExhausted) {
         // This should be one unpaired high surrogate.
-        ASSERT((characters + 1) == (characters + length));
+        ASSERT((characters + 1) == (this->characters() + length));
         ASSERT((*characters >= 0xD800) && (*characters <= 0xDBFF));
         // There should be room left, since one UChar hasn't been converted.

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-09  Kenneth Russell  <kbr@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Assertion failure in String::utf8() for certain invalid UTF16 inputs
+        https://bugs.webkit.org/show_bug.cgi?id=41983
+
+        * fast/canvas/webgl/invalid-UTF-16-expected.txt: Added.
+        * fast/canvas/webgl/invalid-UTF-16.html: Added.
+
 2010-07-09  Tony Gentilcore  <tonyg@chromium.org>