Skip to content

8363813: Missing null check in GlassScreen #1854

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

Closed
arapte wants to merge 1 commit into from
Closed

8363813: Missing null check in GlassScreen #1854

Show file tree
Hide file tree
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: 6 additions & 4 deletions modules/javafx.graphics/src/main/native-glass/gtk/glass_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,12 @@ jobjectArray rebuild_screens(JNIEnv* env) {
JNI_EXCEPTION_TO_CPP(env)
LOG1("Available monitors: %d\n", n_monitors)

int i;
for (i=0; i < n_monitors; i++) {
env->SetObjectArrayElement(jscreens, i, createJavaScreen(env, default_gdk_screen, i));
JNI_EXCEPTION_TO_CPP(env)
if (jscreens != NULL) {
int i;
for (i=0; i < n_monitors; i++) {
env->SetObjectArrayElement(jscreens, i, createJavaScreen(env, default_gdk_screen, i));
JNI_EXCEPTION_TO_CPP(env)
}
}

return jscreens;
Expand Down
8 changes: 5 additions & 3 deletions modules/javafx.graphics/src/main/native-glass/ios/GlassScreen.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ jobjectArray createJavaScreens(JNIEnv* env) {
mat_jScreenClass,
NULL);

for (NSUInteger index = 0; index < [screens count]; index++) {
jobject javaScreen = createJavaScreen(env, [screens objectAtIndex:index]);
(*env)->SetObjectArrayElement(env, screenArray, index, javaScreen);
if (screenArray != NULL) {
for (NSUInteger index = 0; index < [screens count]; index++) {
jobject javaScreen = createJavaScreen(env, [screens objectAtIndex:index]);
(*env)->SetObjectArrayElement(env, screenArray, index, javaScreen);
}
}

return screenArray;
Expand Down
26 changes: 14 additions & 12 deletions modules/javafx.graphics/src/main/native-glass/mac/GlassScreen.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,22 @@ jobjectArray createJavaScreens(JNIEnv* env) {
jScreenClass,
NULL);
GLASS_CHECK_EXCEPTION(env);
maxScreenDimensions = NSMakeSize(0.f,0.f);
for (NSUInteger index = 0; index < [screens count]; index++) {
NSRect screenRect = [[screens objectAtIndex:index] frame];
if (screenArray != NULL) {
maxScreenDimensions = NSMakeSize(0.f,0.f);
for (NSUInteger index = 0; index < [screens count]; index++) {
NSRect screenRect = [[screens objectAtIndex:index] frame];

if (screenRect.size.width > maxScreenDimensions.width) {
maxScreenDimensions.width = screenRect.size.width;
}
if (screenRect.size.height > maxScreenDimensions.height) {
maxScreenDimensions.height = screenRect.size.height;
}
if (screenRect.size.width > maxScreenDimensions.width) {
maxScreenDimensions.width = screenRect.size.width;
}
if (screenRect.size.height > maxScreenDimensions.height) {
maxScreenDimensions.height = screenRect.size.height;
}

jobject javaScreen = createJavaScreen(env, [screens objectAtIndex:index]);
(*env)->SetObjectArrayElement(env, screenArray, index, javaScreen);
GLASS_CHECK_EXCEPTION(env);
jobject javaScreen = createJavaScreen(env, [screens objectAtIndex:index]);
(*env)->SetObjectArrayElement(env, screenArray, index, javaScreen);
GLASS_CHECK_EXCEPTION(env);
}
}

return screenArray;
Expand Down
2 changes: 1 addition & 1 deletion modules/javafx.graphics/src/main/native-glass/win/GlassScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ jobjectArray GlassScreen::CreateJavaScreens(JNIEnv *env)
jclass screenCls = GetScreenCls(env);

jobjectArray jScreens = env->NewObjectArray(numMonitors, screenCls, NULL);
if (CheckAndClearException(env)) {
if (CheckAndClearException(env) || jScreens == NULL) {
free(g_MonitorInfos.pMonitorInfos);
g_MonitorInfos.numInfos = g_MonitorInfos.maxInfos = 0;
g_MonitorInfos.pMonitorInfos = NULL;
Expand Down