diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index a8f89f15e15a..0c174941dbf5 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -238,6 +238,8 @@ v8::Local NativeImage::ToPNG(v8::Isolate* isolate) { } v8::Local NativeImage::ToBitmap(v8::Isolate* isolate) { + if (IsEmpty()) return node::Buffer::New(isolate, 0).ToLocalChecked(); + const SkBitmap* bitmap = image_.ToSkBitmap(); SkPixelRef* ref = bitmap->pixelRef(); return node::Buffer::Copy(isolate, @@ -264,6 +266,8 @@ std::string NativeImage::ToDataURL() { } v8::Local NativeImage::GetBitmap(v8::Isolate* isolate) { + if (IsEmpty()) return node::Buffer::New(isolate, 0).ToLocalChecked(); + const SkBitmap* bitmap = image_.ToSkBitmap(); SkPixelRef* ref = bitmap->pixelRef(); return node::Buffer::New(isolate, @@ -276,6 +280,8 @@ v8::Local NativeImage::GetBitmap(v8::Isolate* isolate) { v8::Local NativeImage::GetNativeHandle(v8::Isolate* isolate, mate::Arguments* args) { #if defined(OS_MACOSX) + if (IsEmpty()) return node::Buffer::New(isolate, 0).ToLocalChecked(); + NSImage* ptr = image_.AsNSImage(); return node::Buffer::Copy( isolate,