From 9b44f5a7550d8ede2eda763770e927df4c15cc8e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 25 Apr 2008 12:00:18 -0600
Subject: gallium: added a null ptr check

---
 src/mesa/state_tracker/st_cb_texture.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index a6c4351fff6..9fd9fd70ea9 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -896,6 +896,11 @@ st_TexSubimage(GLcontext * ctx,
       dstRowStride = stImage->surface->pitch * stImage->surface->cpp;
    }
 
+   if (!texImage->Data) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");
+      return;
+   }
+
    src = (const GLubyte *) pixels;
 
    for (i = 0; i++ < depth;) {
@@ -907,10 +912,11 @@ st_TexSubimage(GLcontext * ctx,
 					   texImage->ImageOffsets,
 					   width, height, 1,
 					   format, type, src, packing)) {
-	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "st_TexSubImage");
+	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");
       }
 
       if (stImage->pt && i < depth) {
+         /* map next slice of 3D texture */
 	 st_texture_image_unmap(stImage);
 	 texImage->Data = st_texture_image_map(ctx->st, stImage, zoffset + i);
 	 src += srcImageStride;
-- 
cgit v1.2.3