Changeset 12652 in webkit

Timestamp:

Feb 7, 2006 6:39:22 PM (18 years ago)

Author:

adele

Message:

LayoutTests:

• test for <rdar://problem/3727939> Safari strips \0 characters from HTML tags making them valid

• fast/encoding/decoder-allow-null-chars.html
• fast/encoding/decoder-allow-null-chars-expected.txt

WebCore:

Reviewed by Maciej.

• Fixed <rdar://problem/3727939> Safari strips \0 characters from HTML tags making them valid

Test: fast/encoding/decoder-allow-null-chars.html

• kwq/KWQTextCodec.cpp: (KWQTextDecoder::convertLatin1): Removed stripping of null characters (unwanted): ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/encoding/decoder-allow-null-chars-expected.txt (added)
• LayoutTests/fast/encoding/decoder-allow-null-chars.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/kwq/KWQTextCodec.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-02-07  Adele Peterson  <adele@apple.com>
+
+       - test for 
+        <rdar://problem/3727939> Safari strips \0 characters from HTML tags making them valid
+
+        * fast/encoding/decoder-allow-null-chars.html
+        * fast/encoding/decoder-allow-null-chars-expected.txt
+
 2006-02-07  Alexey Proskuryakov  <ap@nypop.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-02-07  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Maciej.
+
+        - Fixed <rdar://problem/3727939> Safari strips \0 characters from HTML tags making them valid 
+
+        Test: fast/encoding/decoder-allow-null-chars.html
+
+        * kwq/KWQTextCodec.cpp:
+        (KWQTextDecoder::convertLatin1): Removed stripping of null characters
+        (unwanted): ditto.
+
 2006-02-07  David Hyatt <hyatt@apple.com>
 

trunk/WebCore/kwq/KWQTextCodec.cpp

@@ -285 +285 @@
     ASSERT(_numBufferedBytes == 0);
 
-    int i;
-    for (i = 0; i != length; ++i) {
-        if (s[i] == 0) {
-            break;
-        }
-    }
-    if (i == length) {
-        return QString(reinterpret_cast<const char *>(s), length);
-    }
-
-    QString result("");
-    
-    result.reserve(length);
-    
-    result.append(reinterpret_cast<const char *>(s), i);
-    int start = ++i;
-    for (; i != length; ++i) {
-        if (s[i] == 0) {
-            if (start != i) {
-                result.append(reinterpret_cast<const char *>(&s[start]), i - start);
-            }
-            start = i + 1;
-        }
-    }
-    if (start != length) {
-        result.append(reinterpret_cast<const char *>(&s[start]), length - start);
-    }
-
-    return result;
+    return QString(reinterpret_cast<const char *>(s), length);
 }
 
@@ -406 +378 @@
 }
 
-// We strip NUL characters because other browsers (at least WinIE) do.
 // We strip replacement characters because the ICU converter for UTF-8 converts
 // invalid sequences into replacement characters, but other browsers discard them.
@@ -414 +385 @@
 {
     switch (c) {
-        case 0:
         case replacementCharacter:
         case BOM: