Changeset 43195 in webkit for trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

Timestamp:

May 4, 2009, 5:20:55 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-04 Kai Brüning <​[email protected]>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=24883
24883: Bad success test in parseXMLDocumentFragment in XMLTokenizerLibxml2.cpp

Fixed test whether all the chunk has been processed to correctly count utf8 bytes.

Test: fast/innerHTML/innerHTML-nbsp.xhtml

• dom/XMLTokenizerLibxml2.cpp: (WebCore::parseXMLDocumentFragment):

File:

• trunk/WebCore/dom/XMLTokenizerLibxml2.cpp (modified) (2 diffs)

trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

@@ -1293 +1293 @@
     XMLTokenizer tokenizer(fragment, parent);
     
-    tokenizer.initializeParserContext(chunk.utf8().data());
+    CString chunkAsUtf8 = chunk.utf8();
+    tokenizer.initializeParserContext(chunkAsUtf8.data());
 
     xmlParseContent(tokenizer.m_context);
@@ -1301 +1302 @@
     // Check if all the chunk has been processed.
     long bytesProcessed = xmlByteConsumed(tokenizer.m_context);
-    if (bytesProcessed == -1 || ((unsigned long)bytesProcessed) == sizeof(UChar) * chunk.length())
+    if (bytesProcessed == -1 || ((unsigned long)bytesProcessed) != chunkAsUtf8.length())
         return false;