commit 3ea05e6a1a6d04225ee2f5c3d0bdb65bb5bc5cd8
author Dmitri Trembovetski <tdv@openjdk.org> Wed May 14 09:16:18 2008 -0700
committer Dmitri Trembovetski <tdv@openjdk.org> Wed May 14 09:16:18 2008 -0700
tree 6db7891e4909751be9d18af88a7131704f012c82
parent 02e4fc676c5ffb442a9df8974935000c481e5ac4

6604044: java crashes talking to second X screen

Reviewed-by: prr

jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c

diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
index 68299f7..7f64a88 100644
--- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
+++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
@@ -650,7 +650,7 @@
         if (XineramaQueryScreens != NULL) {
             DTRACE_PRINTLN("calling XineramaQueryScreens func on Linux");
             xinInfo = (*XineramaQueryScreens)(awt_display, &locNumScr);
-            if (xinInfo != NULL) {
+            if (xinInfo != NULL && locNumScr > XScreenCount(awt_display)) {
                 int32_t idx;
                 DTRACE_PRINTLN("Enabling Xinerama support");
                 usingXinerama = True;
@@ -701,7 +701,8 @@
         if (XineramaSolarisFunc != NULL) {
             DTRACE_PRINTLN("calling XineramaGetInfo func on Solaris");
             if ((*XineramaSolarisFunc)(awt_display, 0, &fbrects[0],
-                                       &fbhints[0], &locNumScr) != 0)
+                                       &fbhints[0], &locNumScr) != 0 &&
+                locNumScr > XScreenCount(awt_display))
             {
                 DTRACE_PRINTLN("Enabling Xinerama support");
                 usingXinerama = True;