From 808b8e59c09ac5977ab020bd1771225a4e0a4cc4 Mon Sep 17 00:00:00 2001 From: Juha-Pekka Heikkila Date: Fri, 25 Apr 2014 15:20:36 +0300 Subject: [PATCH] i965: Avoid null access in intelMakeCurrent() separate two null checks connected with && to their own if branches. Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_context.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 5e2f175bdde..ca389f80d7b 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -985,13 +985,17 @@ intelMakeCurrent(__DRIcontext * driContextPriv, struct gl_context *ctx = &brw->ctx; struct gl_framebuffer *fb, *readFb; - if (driDrawPriv == NULL && driReadPriv == NULL) { + if (driDrawPriv == NULL) { fb = _mesa_get_incomplete_framebuffer(); - readFb = _mesa_get_incomplete_framebuffer(); } else { fb = driDrawPriv->driverPrivate; - readFb = driReadPriv->driverPrivate; driContextPriv->dri2.draw_stamp = driDrawPriv->dri2.stamp - 1; + } + + if (driReadPriv == NULL) { + readFb = _mesa_get_incomplete_framebuffer(); + } else { + readFb = driReadPriv->driverPrivate; driContextPriv->dri2.read_stamp = driReadPriv->dri2.stamp - 1; } -- 2.30.2