From 423a53f635f82233e9a570bfc132edc51f7548bb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 10:16:59 -0600
Subject: mesa: if maxLevels==0, target is invalid

---
 src/mesa/main/texgetimage.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa')

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 2d3b82dd38..14d6fc7659 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -373,7 +373,10 @@ getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
    struct gl_texture_image *texImage;
    const GLuint maxLevels = _mesa_max_texture_levels(ctx, target);
 
-   ASSERT(maxLevels > 0);  /* 0 indicates bad target, caught above */
+   if (maxLevels == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target=0x%x)", target);
+      return GL_TRUE;
+   }
 
    if (level < 0 || level >= maxLevels) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
-- 
cgit v1.2.3