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

Fix crash when converting invalid image to JPEG

Browse source
This commit is contained in:
Cheng Zhao 2017-07-31 15:48:54 +09:00
parent a6c8329a68
commit 6ee95f9529
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/common/api/atom_api_native_image.cc
View file

@ -291,6 +291,8 @@ v8::Local<v8::Value> NativeImage::ToBitmap(mate::Arguments* args) {
v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) { v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
std::vector<unsigned char> output; std::vector<unsigned char> output;
gfx::JPEG1xEncodedDataFromImage(image_, quality, &output); gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
if (output.empty())
return node::Buffer::New(isolate, 0).ToLocalChecked();
return node::Buffer::Copy( return node::Buffer::Copy(
isolate, isolate,
reinterpret_cast<const char*>(&output.front()), reinterpret_cast<const char*>(&output.front()),