[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
barraclough at apple.com
barraclough at apple.com
Thu Apr 8 01:13:12 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 5e40486aa8f01d0c2a59deda72f63b640cbf0361
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 18 19:40:44 2010 +0000
* platform/win/ClipboardUtilitiesWin.cpp:
(WebCore::createGlobalData):
Reviewed by NOBODY (windows build fix).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dfdba36..764fcb7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-18 Gavin Barraclough <barraclough at apple.com>
+
+ Reviewed by NOBODY (windows build fix).
+
+ * platform/win/ClipboardUtilitiesWin.cpp:
+ (WebCore::createGlobalData):
+
2010-01-15 Gavin Barraclough <barraclough at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/WebCore/platform/win/ClipboardUtilitiesWin.cpp
index 0358b7a..c14b18f 100644
--- a/WebCore/platform/win/ClipboardUtilitiesWin.cpp
+++ b/WebCore/platform/win/ClipboardUtilitiesWin.cpp
@@ -114,7 +114,11 @@ HGLOBAL createGlobalData(const KURL& url, const String& title)
if (cbData) {
PWSTR buffer = (PWSTR)::GlobalLock(cbData);
- swprintf_s(buffer, size, L"%s\n%s", mutableURL.charactersWithNullTermination(), mutableTitle.charactersWithNullTermination());
+ OwnArrayPtr<const UChar> nullTerminatedURL;
+ mutableURL.copyWithNullTermination(nullTerminatedURL);
+ OwnArrayPtr<const UChar> nullTerminatedTitle;
+ mutableTitle.copyWithNullTermination(nullTerminatedTitle);
+ swprintf_s(buffer, size, L"%s\n%s", nullTerminatedURL.get(), nullTerminatedTitle.get());
::GlobalUnlock(cbData);
}
return cbData;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list