[PATCH 0/1] MR9806: win32u: Get the context drawable pointer again after context_sync_drawables.

[Rémi Bernon]

I don't think this happens with upstream Wine, unless perhaps with Android (but who knows if it even works now), but it's theoretically possible and it should be harmless and avoid a possible crash.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9806

[PATCH 1/1] win32u: Get the context drawable pointer again after context_sync_drawables.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/win32u/opengl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index 44680d3bf9e..51d386b1bc2 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -2279,6 +2279,7 @@ static BOOL win32u_wgl_context_flush( struct wgl_context *context, void (*flush)
     TRACE( "context %p, hwnd %p, interval %d, flush %p\n", context, draw->client->hwnd, interval, flush );
 
     context_sync_drawables( context, 0, 0 );
+    if (!(draw = context->draw)) return FALSE; /* should never happen */
 
     if (flush) flush();
     if (flush == funcs->p_glFinish) flags |= GL_FLUSH_FINISHED;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9806