mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clipboard.read() crash (#31566)

Browse source
This commit is contained in:
Shelley Vohr 2021-10-26 14:14:08 +02:00 committed by GitHub
parent 78626a5cc6
commit deb7ab2a40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
shell/common/api/electron_api_clipboard.cc
View file

@ -51,6 +51,17 @@ bool Clipboard::Has(const std::string& format_string,
std::string Clipboard::Read(const std::string& format_string) { std::string Clipboard::Read(const std::string& format_string) {
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
ui::ClipboardFormatType format(
ui::ClipboardFormatType::CustomPlatformType(format_string));
std::string data;
clipboard->ReadData(format, /* data_dst = */ nullptr, &data);
return data;
}
v8::Local<v8::Value> Clipboard::ReadBuffer(const std::string& format_string,
gin_helper::Arguments* args) {
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
std::map<std::string, std::string> custom_format_names; std::map<std::string, std::string> custom_format_names;
custom_format_names = custom_format_names =
clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste, clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
@ -68,12 +79,6 @@ std::string Clipboard::Read(const std::string& format_string) {
std::string data; std::string data;
clipboard->ReadData(format, /* data_dst = */ nullptr, &data); clipboard->ReadData(format, /* data_dst = */ nullptr, &data);
return data;
}
v8::Local<v8::Value> Clipboard::ReadBuffer(const std::string& format_string,
gin_helper::Arguments* args) {
std::string data = Read(format_string);
return node::Buffer::Copy(args->isolate(), data.data(), data.length()) return node::Buffer::Copy(args->isolate(), data.data(), data.length())
.ToLocalChecked(); .ToLocalChecked();
} }

26
spec/api-clipboard-spec.js
View file

@ -44,13 +44,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
}); });
}); });
describe('clipboard.readBookmark', () => { ifdescribe(process.platform !== 'linux')('clipboard.readBookmark', () => {
before(function () {
if (process.platform === 'linux') {
this.skip();
}
});
it('returns title and url', () => { it('returns title and url', () => {
clipboard.writeBookmark('a title', 'https://electronjs.org'); clipboard.writeBookmark('a title', 'https://electronjs.org');
@ -68,6 +62,16 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
}); });
}); });
ifdescribe(process.platform !== 'linux')('clipboard.read()', () => {
it('does not crash when reading various custom clipboard types', () => {
const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW';
expect(() => {
const result = clipboard.read(type);
}).to.not.throw();
});
});
describe('clipboard.write()', () => { describe('clipboard.write()', () => {
it('returns data correctly', () => { it('returns data correctly', () => {
const text = 'test'; const text = 'test';
@ -100,13 +104,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
}); });
}); });
describe('clipboard.read/writeFindText(text)', () => { ifdescribe(process.platform === 'darwin')('clipboard.read/writeFindText(text)', () => {
before(function () {
if (process.platform !== 'darwin') {
this.skip();
}
});
it('reads and write text to the find pasteboard', () => { it('reads and write text to the find pasteboard', () => {
clipboard.writeFindText('find this'); clipboard.writeFindText('find this');
expect(clipboard.readFindText()).to.equal('find this'); expect(clipboard.readFindText()).to.equal('find this');