[PATCH 0/1] MR158: winex11: Check for invalid format in get_tile_pict
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52747 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/158
From: Alex Henrie <alexhenrie24(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52747 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/xrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 585299cba9e..826a07fdf1d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1212,6 +1212,8 @@ static Picture get_tile_pict( enum wxr_format wxr_format, const XRenderColor *co XRenderColor current_color; } tiles[WXR_NB_FORMATS], *tile; + if (wxr_format == WXR_INVALID_FORMAT) return 0; + tile = &tiles[wxr_format]; if(!tile->xpm) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/158
We shouldn't even get there with an invalid format, it should have been caught earlier. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/158#note_1415
I am going to close this merge request because the bug seems to have disappeared as a result of other changes to winex11. If it pops up again, I will take your advice and write a patch that does the invalid format check sooner. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/158#note_1448
This merge request was closed by Alex Henrie. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/158
participants (3)
-
Alex Henrie -
Alex Henrie (@alexhenrie) -
Alexandre Julliard (@julliard)