[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit eab53e60a5ecedfddca9a514b812c854ca3483ad
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 05:58:29 2010 +0000

    2010-01-20  Kwang Yul Seo  <skyul at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07cde20..b2d6e7d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-20  Kwang Yul Seo  <skyul at 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 at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/dom/XMLTokenizerLibxml2.cpp b/WebCore/dom/XMLTokenizerLibxml2.cpp
index cac88d4..af79519 100644
--- a/WebCore/dom/XMLTokenizerLibxml2.cpp
+++ b/WebCore/dom/XMLTokenizerLibxml2.cpp
@@ -169,11 +169,11 @@ public:
         m_callbacks.append(callback);        
     }
     
-    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;
         callback->columnNumber = columnNumber;
@@ -316,16 +316,16 @@ private:
     struct PendingErrorCallback: public PendingCallback {
         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;
     };
@@ -910,7 +910,7 @@ void XMLTokenizer::error(ErrorType type, const char* message, va_list args)
 #endif
     
     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());
 

-- 
WebKit Debian packaging