Win32: Add missing out parameter NULL checks

This fixes _glfwPlatformGetMonitorWorkarea not checking if its out
parameters were NULL.

Related to #1322.
This commit is contained in:
Doug Binks 2018-09-08 17:14:57 +02:00 committed by Camilla Löwy
parent 5c752355cb
commit f7733c7b4f

View File

@ -377,10 +377,14 @@ void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos
hMonitor = MonitorFromPoint( pointInMonitor, 0 ); hMonitor = MonitorFromPoint( pointInMonitor, 0 );
GetMonitorInfo(hMonitor, &monitorInfo); GetMonitorInfo(hMonitor, &monitorInfo);
*xpos = monitorInfo.rcWork.left; if (xpos)
*ypos = monitorInfo.rcWork.top; *xpos = monitorInfo.rcWork.left;
*width = monitorInfo.rcWork.right - monitorInfo.rcWork.left; if (ypos)
*height = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top; *ypos = monitorInfo.rcWork.top;
if (width)
*width = monitorInfo.rcWork.right - monitorInfo.rcWork.left;
if (height)
*height = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top;
} }
GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count) GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)