Mesa (master): drisw: Move pointer dereferences to after NULL checks.

Vinson Lee vlee at kemper.freedesktop.org
Fri Apr 16 07:37:28 UTC 2010


Module: Mesa
Branch: master
Commit: 8c456775887e192dd7464b94295f4410045c7c07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c456775887e192dd7464b94295f4410045c7c07

Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Apr 16 00:35:30 2010 -0700

drisw: Move pointer dereferences to after NULL checks.

---

 src/mesa/drivers/dri/swrast/swrast.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 8b68281..6f54981 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -602,12 +602,14 @@ dri_make_current(__DRIcontext * cPriv,
 
     if (cPriv) {
 	struct dri_context *ctx = dri_context(cPriv);
-	struct dri_drawable *draw = dri_drawable(driDrawPriv);
-	struct dri_drawable *read = dri_drawable(driReadPriv);
+	struct dri_drawable *draw;
+	struct dri_drawable *read;
 
 	if (!driDrawPriv || !driReadPriv)
 	    return GL_FALSE;
 
+	draw = dri_drawable(driDrawPriv);
+	read = dri_drawable(driReadPriv);
 	mesaCtx = &ctx->Base;
 	mesaDraw = &draw->Base;
 	mesaRead = &read->Base;




More information about the mesa-commit mailing list