Dont crash if XRRGetCrtcInfo() returns NULL

kovidgoyal · kovidgoyal · commit ab7f3310c4f7 · 2018-08-03T16:17:25.000+05:30
diff --git a/glfw/x11_monitor.c b/glfw/x11_monitor.c
@@ -152,6 +152,11 @@ void _glfwPollMonitorsX11(void)
             }
 
             ci = XRRGetCrtcInfo(_glfw.x11.display, sr, oi->crtc);
+            if (!ci)
+            {
+                XRRFreeOutputInfo(oi);
+                continue;
+            }
             if (ci->rotation == RR_Rotate_90 || ci->rotation == RR_Rotate_270)
             {
                 widthMM  = oi->mm_height;
@@ -501,4 +506,3 @@ GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle)
     _GLFW_REQUIRE_INIT_OR_RETURN(None);
     return monitor->x11.output;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,11 @@ void _glfwPollMonitorsX11(void)`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`ci = XRRGetCrtcInfo(_glfw.x11.display, sr, oi->crtc);`
	`155`	`+ if (!ci)`
	`156`	`+ {`
	`157`	`+ XRRFreeOutputInfo(oi);`
	`158`	`+ continue;`
	`159`	`+ }`
`155`	`160`	`if (ci->rotation == RR_Rotate_90 \|\| ci->rotation == RR_Rotate_270)`
`156`	`161`	`{`
`157`	`162`	`widthMM = oi->mm_height;`
`@@ -501,4 +506,3 @@ GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle)`
`501`	`506`	`_GLFW_REQUIRE_INIT_OR_RETURN(None);`
`502`	`507`	`return monitor->x11.output;`
`503`	`508`	`}`
`504`		`-`