[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d056d0fe1b4b2357633d31f22ec6a857e687b0cf
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 08:46:21 2010 +0000

    2010-09-15  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [WINCE] Avoid memcpy in TextCodecWinCE::encode
            https://bugs.webkit.org/show_bug.cgi?id=45468
    
            * platform/text/wince/TextCodecWinCE.cpp:
            (WebCore::TextCodecWinCE::encode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c23f1b..e3c06d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-15  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [WINCE] Avoid memcpy in TextCodecWinCE::encode
+        https://bugs.webkit.org/show_bug.cgi?id=45468
+
+        * platform/text/wince/TextCodecWinCE.cpp:
+        (WebCore::TextCodecWinCE::encode):
+
 2010-09-14  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Dumitru Daniliuc.
diff --git a/WebCore/platform/text/wince/TextCodecWinCE.cpp b/WebCore/platform/text/wince/TextCodecWinCE.cpp
index 8e5711d..499035f 100644
--- a/WebCore/platform/text/wince/TextCodecWinCE.cpp
+++ b/WebCore/platform/text/wince/TextCodecWinCE.cpp
@@ -367,11 +367,12 @@ CString TextCodecWinCE::encode(const UChar* characters, size_t length, Unencodab
     if (resultLength <= 0)
         return "?";
 
-    Vector<char> result(resultLength);
+    char* characterBuffer;
+    CString result = CString::newUninitialized(resultLength, characterBuffer);
 
-    WideCharToMultiByte(m_codePage, flags, characters, length, result.data(), resultLength, 0, 0);
+    WideCharToMultiByte(m_codePage, flags, characters, length, characterBuffer, resultLength, 0, 0);
 
-    return CString(result.data(), result.size());
+    return result;
 }
 
 void TextCodecWinCE::enumerateSupportedEncodings(EncodingReceiver& receiver)

-- 
WebKit Debian packaging