Changeset 18934 for S60/trunk/WebCore

Timestamp:

01/18/07 06:33:14 (2 years ago)

Author:

yongjzha

Message:

2007-01-15 raalexan <rasvan.alexandrescu@nokia.com>

Reviewed by Yongjun Zhang.
DESC: Crashes in web pages with rss feeds like www.google.com/ig
http://bugs.webkit.org/show_bug.cgi?id=12289

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/xml/xml_tokenizer.cpp: (khtml::createQStringParser): (khtml::parseQString):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/xml/xml_tokenizer.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-15  raalexan  <rasvan.alexandrescu@nokia.com>
+
+        Reviewed by Yongjun Zhang.
+        DESC: Crashes in web pages with rss feeds like www.google.com/ig
+        http://bugs.webkit.org/show_bug.cgi?id=12289
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/xml/xml_tokenizer.cpp:
+        (khtml::createQStringParser):
+        (khtml::parseQString):
+
 2007-01-16  w3liu  <wei.liu@nokia.com>
 

S60/trunk/WebCore/khtml/xml/xml_tokenizer.cpp

@@ -237 +237 @@
     const QChar BOM(0xFEFF);
     const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
+    if (parser != NULL)
     xmlSwitchEncoding(parser, BOMHighByte == 0xFF ? XML_CHAR_ENCODING_UTF16LE : XML_CHAR_ENCODING_UTF16BE);
     return parser;
@@ -243 +244 @@
 static void parseQString(xmlParserCtxtPtr parser, const QString &string)
 {
+    if ( parser != NULL )
+        {
     xmlParseChunk(parser,
         reinterpret_cast<const char *>(string.unicode()),
         string.length() * sizeof(QChar), 1);
+        }
 }