From: Vinson Lee <vlee@vmware.com>
Date: Sun, 18 Apr 2010 06:40:14 +0000 (-0700)
Subject: st/dri: Check for NULL before dereference and assignment.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=010f81f32b9e68b768b3436f98953f1d1c0bf1d4;p=mesa.git

st/dri: Check for NULL before dereference and assignment.
---

diff --git a/src/gallium/state_trackers/dri/drm/dri1.c b/src/gallium/state_trackers/dri/drm/dri1.c
index bdf251653d9..e216e46a87e 100644
--- a/src/gallium/state_trackers/dri/drm/dri1.c
+++ b/src/gallium/state_trackers/dri/drm/dri1.c
@@ -89,10 +89,18 @@ dri1_propagate_drawable_change(struct dri_context *ctx)
 {
    __DRIdrawable *dPriv = ctx->dPriv;
    __DRIdrawable *rPriv = ctx->rPriv;
-   struct dri_drawable *draw = dri_drawable(dPriv);
-   struct dri_drawable *read = dri_drawable(rPriv);
+   struct dri_drawable *draw;
+   struct dri_drawable *read;
    boolean flushed = FALSE;
 
+   if (dPriv) {
+      draw = dri_drawable(dPriv);
+   }
+
+   if (rPriv) {
+      read = dri_drawable(rPriv);
+   }
+
    if (dPriv && draw->texture_stamp != dPriv->lastStamp) {
       ctx->st->flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
       flushed = TRUE;