From 86751cbddfa762a6dbd01fd07102ba91bb90b8e5 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 20 Aug 2013 12:35:28 +0200 Subject: [PATCH] gallium/osmesa: add same checks to OSMesaMakeCurrent as the other osmesa Fixes a opengl crash in wine. Cc: "9.2" Signed-off-by: Maarten Lankhorst --- src/gallium/state_trackers/osmesa/osmesa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/osmesa/osmesa.c b/src/gallium/state_trackers/osmesa/osmesa.c index 9f9d2ad033c..bb85e5c2f0c 100644 --- a/src/gallium/state_trackers/osmesa/osmesa.c +++ b/src/gallium/state_trackers/osmesa/osmesa.c @@ -616,10 +616,11 @@ OSMesaMakeCurrent(OSMesaContext osmesa, void *buffer, GLenum type, struct osmesa_buffer *osbuffer; enum pipe_format color_format; - if (osmesa->format == OSMESA_RGB_565 && type != GL_UNSIGNED_SHORT_5_6_5) { + if (!osmesa || !buffer || width < 1 || height < 1) { return GL_FALSE; } - if (width < 1 || height < 1) { + + if (osmesa->format == OSMESA_RGB_565 && type != GL_UNSIGNED_SHORT_5_6_5) { return GL_FALSE; } -- 2.30.2