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

fix: don't crash when nativeImage.createFromBuffer() called with invalid buffer (#17344)

Browse source
This commit is contained in:
Milan Burda 2019-03-13 16:26:11 +01:00 • committed by Shelley Vohr
parent 90fcc574f4
commit df7dc9396e
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -508,6 +508,11 @@ mate::Handle<NativeImage> NativeImage::CreateFromPath(
mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
mate::Arguments* args,
v8::Local<v8::Value> buffer) {
if (!node::Buffer::HasInstance(buffer)) {
args->ThrowError("buffer must be a node Buffer");
return mate::Handle<NativeImage>();
}
int width = 0;
int height = 0;
double scale_factor = 1.;