Merge pull request #54 from lewisl9029/handle-null-screenshot-bitmap

s1hofmann · web-flow · commit 938ac4269713 · 2021-03-11T08:08:51.000+01:00
Throw error on null bitmap to prevent crash
diff --git a/src/main.cc b/src/main.cc
@@ -758,6 +758,10 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info)
 	}
 
 	MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));
+	
+	if (bitmap == NULL) {
+		throw Napi::Error::New(env, "Error: Failed to capture screen");
+	}
 
 	uint32_t bufferSize = bitmap->bytewidth * bitmap->height;
 	Napi::Buffer<char> buffer = Napi::Buffer<char>::New(env, (char *)bitmap->imageBuffer, bufferSize, finalizer);

Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,10 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info)`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));`
	`761`	`+`
	`762`	`+ if (bitmap == NULL) {`
	`763`	`+ throw Napi::Error::New(env, "Error: Failed to capture screen");`
	`764`	`+ }`
`761`	`765`
`762`	`766`	`uint32_t bufferSize = bitmap->bytewidth * bitmap->height;`
`763`	`767`	`Napi::Buffer<char> buffer = Napi::Buffer<char>::New(env, (char *)bitmap->imageBuffer, bufferSize, finalizer);`