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

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f43cac5489ac6cf4cd64483fe8baa33db513aa16
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 22:46:47 2010 +0000

    Windows build fix following r69806.
    
    * platform/win/ClipboardUtilitiesWin.cpp:
    (WebCore::markupToCFHTML):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69810 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 701bd96..e6acb80 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-14  Gavin Barraclough  <barraclough at apple.com>
+
+        Windows build fix following r69806.
+
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::markupToCFHTML):
+
 2010-10-14  Dawit Alemayehu  <adawit at kde.org>
 
         Reviewed by Andreas Kling
diff --git a/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/WebCore/platform/win/ClipboardUtilitiesWin.cpp
index f8da764..19888bf 100644
--- a/WebCore/platform/win/ClipboardUtilitiesWin.cpp
+++ b/WebCore/platform/win/ClipboardUtilitiesWin.cpp
@@ -33,6 +33,7 @@
 #include "markup.h"
 #include <shlwapi.h>
 #include <wininet.h> // for INTERNET_MAX_URL_LENGTH
+#include <wtf/StringExtras.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 
@@ -241,9 +242,10 @@ void markupToCFHTML(const String& markup, const String& srcURL, Vector<char>& re
     unsigned endHTMLOffset = endFragmentOffset + strlen(endMarkup);
 
     unsigned headerBufferLength = startHTMLOffset + 1; // + 1 for '\0' terminator.
-    char headerBuffer[headerBufferLength];
+    char* headerBuffer = (char*)malloc(headerBufferLength);
     snprintf(headerBuffer, headerBufferLength, header, startHTMLOffset, endHTMLOffset, startFragmentOffset, endFragmentOffset);
     append(result, CString(headerBuffer));
+    free(headerBuffer);
     if (sourceURLUTF8.length()) {
         append(result, sourceURLPrefix);
         append(result, sourceURLUTF8);

-- 
WebKit Debian packaging