Changeset 53604 in webkit

Timestamp:

Jan 20, 2010 9:58:29 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-20 Kwang Yul Seo <​skyul@company100.net>

Reviewed by Alexey Proskuryakov.

Use xmlStrdup instead of strdup for consistency in Libxml2.
​https://bugs.webkit.org/show_bug.cgi?id=33935

Remove the direct use of strdup.

• dom/XMLTokenizerLibxml2.cpp: (WebCore::PendingCallbacks::appendErrorCallback): (WebCore::PendingCallbacks::): (WebCore::XMLTokenizer::error):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/XMLTokenizerLibxml2.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-20  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use xmlStrdup instead of strdup for consistency in Libxml2.
+        https://bugs.webkit.org/show_bug.cgi?id=33935
+
+        Remove the direct use of strdup.
+
+        * dom/XMLTokenizerLibxml2.cpp:
+        (WebCore::PendingCallbacks::appendErrorCallback):
+        (WebCore::PendingCallbacks::):
+        (WebCore::XMLTokenizer::error):
+
 2010-01-20  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

@@ -170 +170 @@
     }
     
-    void appendErrorCallback(XMLTokenizer::ErrorType type, const char* message, int lineNumber, int columnNumber)
+    void appendErrorCallback(XMLTokenizer::ErrorType type, const xmlChar* message, int lineNumber, int columnNumber)
     {
         PendingErrorCallback* callback = new PendingErrorCallback;
         
-        callback->message = strdup(message);
+        callback->message = xmlStrdup(message);
         callback->type = type;
         callback->lineNumber = lineNumber;
@@ -317 +317 @@
         virtual ~PendingErrorCallback() 
         {
-            free(message);
+            xmlFree(message);
         }
         
         virtual void call(XMLTokenizer* tokenizer) 
         {
-            tokenizer->handleError(type, message, lineNumber, columnNumber);
+            tokenizer->handleError(type, reinterpret_cast<char*>(message), lineNumber, columnNumber);
         }
         
         XMLTokenizer::ErrorType type;
-        char* message;
+        xmlChar* message;
         int lineNumber;
         int columnNumber;
@@ -911 +911 @@
     
     if (m_parserPaused)
-        m_pendingCallbacks->appendErrorCallback(type, m, lineNumber(), columnNumber());
+        m_pendingCallbacks->appendErrorCallback(type, reinterpret_cast<const xmlChar*>(m), lineNumber(), columnNumber());
     else
         handleError(type, m, lineNumber(), columnNumber());