bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix crashes when dragging an image with OSR enabled (issue #2525)

This commit is contained in:
Marshall Greenblatt 2018-10-10 14:44:02 +03:00
parent c8ac6c879d
commit 924c2e339e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcef/common/drag_data_impl.cc
View File

@ -96,9 +96,6 @@ CefString CefDragDataImpl::GetFragmentBaseURL() {
CefString CefDragDataImpl::GetFileName() { CefString CefDragDataImpl::GetFileName() {
base::AutoLock lock_scope(lock_); base::AutoLock lock_scope(lock_);
if (data_.file_contents_content_disposition.empty())
return CefString();
base::Optional<base::FilePath> filename = base::Optional<base::FilePath> filename =
data_.GetSafeFilenameForImageFileContents(); data_.GetSafeFilenameForImageFileContents();
return filename ? CefString(filename->value()) : CefString(); return filename ? CefString(filename->value()) : CefString();

2
tests/cefclient/browser/bytes_write_handler.cc
View File

@ -77,7 +77,7 @@ int BytesWriteHandler::Flush() {
} }
size_t BytesWriteHandler::Grow(size_t size) { size_t BytesWriteHandler::Grow(size_t size) {
base::AutoLock lock_scope(lock_); lock_.AssertAcquired();
size_t rv; size_t rv;
size_t s = (size > grow_ ? size : grow_); size_t s = (size > grow_ ? size : grow_);
void* tmp = realloc(data_, datasize_ + s); void* tmp = realloc(data_, datasize_ + s);