Changeset 66843 in webkit

Timestamp:

Sep 6, 2010 12:11:00 PM (14 years ago)

Author:

robert@webkit.org

Message:

2010-09-06 Robert Hogan <​robert@webkit.org>

Reviewed by Andreas Kling.

[Qt] utf8 encoding of console() messages

Unskip:
http/tests/security/xssAuditor/embed-tag-null-char.html
http/tests/security/xssAuditor/object-embed-tag-null-char.html

Both tests failed because Qt's implementation of String::format()
is casting a utf8 result to String, which assumes latin1 in
its constructor. So instead of casting a QString to a String, use
StringImpl::create() instead. Unfortunately, this involves a lot
of extra casts but the end result is correct.

​https://bugs.webkit.org/show_bug.cgi?id=45240

• wtf/text/WTFString.cpp: (WTF::String::format):

2010-09-06 Robert Hogan <​robert@webkit.org>

Reviewed by Andreas Kling.

[Qt] utf8 encoding of console() messages

Unskip:
http/tests/security/xssAuditor/embed-tag-null-char.html
http/tests/security/xssAuditor/object-embed-tag-null-char.html

Both tests failed because Qt's implementation of String::format()
is casting a utf8 result to String, which assumes latin1 in
its constructor. So instead of casting a QString to a String, use
StringImpl::create() instead. Unfortunately, this involves a lot
of extra casts but the end result is correct.

​https://bugs.webkit.org/show_bug.cgi?id=45240

• platform/qt/Skipped:

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/text/WTFString.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-09-06  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] utf8 encoding of console() messages
+
+        Unskip:
+        http/tests/security/xssAuditor/embed-tag-null-char.html
+        http/tests/security/xssAuditor/object-embed-tag-null-char.html
+
+        Both tests failed because Qt's implementation of String::format()
+        is casting a utf8 result to String, which assumes latin1 in
+        its constructor. So instead of casting a QString to a String, use
+        StringImpl::create() instead. Unfortunately, this involves a lot
+        of extra casts but the end result is correct.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45240
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::format):
+
 2010-09-03  Alexey Proskuryakov  <ap@apple.com>
 

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -336 +336 @@
     va_end(args);
 
-    return buffer;
+    return StringImpl::create(buffer.constData(), buffer.length());
 
 #elif OS(WINCE)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-06  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] utf8 encoding of console() messages
+
+        Unskip:
+        http/tests/security/xssAuditor/embed-tag-null-char.html
+        http/tests/security/xssAuditor/object-embed-tag-null-char.html
+
+        Both tests failed because Qt's implementation of String::format()
+        is casting a utf8 result to String, which assumes latin1 in
+        its constructor. So instead of casting a QString to a String, use
+        StringImpl::create() instead. Unfortunately, this involves a lot
+        of extra casts but the end result is correct.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45240
+
+        * platform/qt/Skipped:
+
 2010-09-06  Justin Schuh  <jschuh@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -181 +181 @@
 # missing origin header
 http/tests/security/originHeader/origin-header-for-empty.html
-
-# Possibly related to https://bugs.webkit.org/show_bug.cgi?id=35263
-# are we utf-encoding a string twice over?
-http/tests/security/xssAuditor/embed-tag-null-char.html
-http/tests/security/xssAuditor/object-embed-tag-null-char.html
 
 # Disabled HTTP subdirs for now, needs investigation.