Skip to content

Add sanity checks to fix crashing issues #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add sanity checks to fix crashing issues #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/macos.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ AXUIElementRef getAXWindowById(int handle) {
NSNumber *windowNumber = info[(id)kCGWindowNumber];

auto app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];
auto path = app ? [app.bundleURL.path UTF8String] : "";
auto path = (app && app.bundleURL && app.bundleURL.path) ? [app.bundleURL.path UTF8String] : "";

if (app && path != "") {
vec.push_back(Napi::Number::New(env, [windowNumber intValue]));
Expand Down Expand Up @@ -147,7 +147,7 @@ AXUIElementRef getAXWindowById(int handle) {

auto app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];

if (![app isActive]) {
if (app && ![app isActive]) {
continue;
}

Expand All @@ -171,6 +171,9 @@ AXUIElementRef getAXWindowById(int handle) {
if (wInfo) {
NSNumber *ownerPid = wInfo[(id)kCGWindowOwnerPID];
NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];
if (!app || !app.bundleURL || !app.bundleURL.path) {
return Napi::Object::New(env);
}

auto obj = Napi::Object::New(env);
obj.Set("processId", [ownerPid intValue]);
Expand All @@ -193,6 +196,9 @@ AXUIElementRef getAXWindowById(int handle) {

if (wInfo) {
NSString *windowName = wInfo[(id)kCGWindowOwnerName];
if (!windowName) {
return Napi::String::New(env, "");
}
return Napi::String::New(env, [windowName UTF8String]);
}

Expand Down