Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-04-06 08:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix null pointer dereference

Browse Source 
Add null check for return values of _glfwPlatformGetTls().
This commit is contained in:
Mingjie Shen 2023-04-21 01:06:56 -04:00
parent 3fa2360720
commit 3c7470bf57
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/egl_context.c
View File

@ -312,7 +312,7 @@ static GLFWglproc getProcAddressEGL(const char* procname)
{ {
_GLFWwindow* window = _glfwPlatformGetTls(&_glfw.contextSlot); _GLFWwindow* window = _glfwPlatformGetTls(&_glfw.contextSlot);
if (window->context.egl.client) if (window && window->context.egl.client)
{ {
GLFWglproc proc = (GLFWglproc) GLFWglproc proc = (GLFWglproc)
_glfwPlatformGetModuleSymbol(window->context.egl.client, procname); _glfwPlatformGetModuleSymbol(window->context.egl.client, procname);

11
src/glx_context.c
View File

@ -191,13 +191,14 @@ static void swapBuffersGLX(_GLFWwindow* window)
static void swapIntervalGLX(int interval) static void swapIntervalGLX(int interval)
{ {
_GLFWwindow* window = _glfwPlatformGetTls(&_glfw.contextSlot);
if (_glfw.glx.EXT_swap_control) if (_glfw.glx.EXT_swap_control)
{ {
_glfw.glx.SwapIntervalEXT(_glfw.x11.display, _GLFWwindow *window = _glfwPlatformGetTls(&_glfw.contextSlot);
window->context.glx.window, if (window) {
interval); _glfw.glx.SwapIntervalEXT(_glfw.x11.display,
window->context.glx.window,
interval);
}
} }
else if (_glfw.glx.MESA_swap_control) else if (_glfw.glx.MESA_swap_control)
_glfw.glx.SwapIntervalMESA(interval); _glfw.glx.SwapIntervalMESA(interval);