Title: [104513] branches/safari-534.54-branch/Source/WebCore
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104512 => 104513)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-10 00:50:10 UTC (rev 104512)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-10 00:55:41 UTC (rev 104513)
@@ -1,5 +1,26 @@
2011-1-9 Lucas Forschler <[email protected]>
+ Merge 102016
+
+ 2011-12-05 Steve Falkenburg <[email protected]>
+
+ Reviewed by Sam Weinig.
+
+ On Windows, filenames not properly preserved when copied into a file list exposed by Event.dataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=73841
+ <rdar://problem/10521879>
+
+ No test since repro case involves dropping a file onto the WebView.
+
+ Calling characters() explicitly causes a non-terminated string buffer to get passed back
+ to the String() constructor that expects a terminated buffer. The characters() call isn't
+ necessary at all, since we have a String and the method we're calling expects a String.
+
+ * platform/win/ClipboardWin.cpp:
+ (WebCore::ClipboardWin::files): Remove characters() since it doesn't null terminate.
+
+2011-1-9 Lucas Forschler <[email protected]>
+
Merge 101584
2011-11-30 Ken Buchanan <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/platform/win/ClipboardWin.cpp (104512 => 104513)
--- branches/safari-534.54-branch/Source/WebCore/platform/win/ClipboardWin.cpp 2012-01-10 00:50:10 UTC (rev 104512)
+++ branches/safari-534.54-branch/Source/WebCore/platform/win/ClipboardWin.cpp 2012-01-10 00:55:41 UTC (rev 104513)
@@ -572,7 +572,7 @@
return files.release();
Vector<String> filesVector = m_dragDataMap.get(cfHDropFormat()->cfFormat);
for (Vector<String>::iterator it = filesVector.begin(); it != filesVector.end(); ++it)
- files->append(File::create((*it).characters()));
+ files->append(File::create(*it));
return files.release();
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
