From a51d0e419a285c5445061a38fdaf3aca02ad2c3c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 12 Dec 2007 14:45:22 -0700
Subject: move some code to avoid deref of NULL ptr

---
 src/mesa/pipe/softpipe/sp_tile_cache.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/pipe/softpipe')

diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/mesa/pipe/softpipe/sp_tile_cache.c
index 25c6dd4d17..d637c7291f 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.c
+++ b/src/mesa/pipe/softpipe/sp_tile_cache.c
@@ -147,10 +147,10 @@ sp_tile_cache_set_surface(struct softpipe_tile_cache *tc,
 
    pipe_surface_reference(&tc->surface, ps);
 
-   if (!ps->map)
-      pipe_surface_map(ps);
-
    if (ps) {
+      if (!ps->map)
+         pipe_surface_map(ps);
+
       tc->depth_stencil = (ps->format == PIPE_FORMAT_S8Z24_UNORM ||
                            ps->format == PIPE_FORMAT_Z16_UNORM ||
                            ps->format == PIPE_FORMAT_Z32_UNORM ||
-- 
cgit v1.2.3