From 4c50969334844bc9aa622176c3ebcbc733394f78 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 25 Apr 2008 15:21:00 -0600
Subject: gallium: added null ptr check

---
 src/mesa/state_tracker/st_cb_texture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/state_tracker')

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 9fd9fd70ea..005bb2e54d 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1373,7 +1373,7 @@ copy_image_data_to_texture(struct st_context *st,
 
       pipe_texture_release(&stImage->pt);
    }
-   else {
+   else if (stImage->base.Data) {
       assert(stImage->base.Data != NULL);
 
       /* More straightforward upload.  
-- 
cgit v1.2.3