From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 12 Feb 2008 23:37:49 +0000 (-0700)
Subject: gallium: added null ptr check
X-Git-Tag: android-x86-1.6~16^2~1465^2~390^2~2644
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a34b43b3f4817268ef4b3f186203b5fbafc7214e;p=android-x86%2Fexternal-mesa.git

gallium: added null ptr check
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index fab9eafc7f0..c6fe928d471 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1514,7 +1514,7 @@ st_finalize_texture(GLcontext *ctx,
 
          /* Need to import images in main memory or held in other textures.
           */
-         if (stObj->pt != stImage->pt) {
+         if (stImage && stObj->pt != stImage->pt) {
             copy_image_data_to_texture(ctx->st, stObj, level, stImage);
 	    *needFlush = GL_TRUE;
          }