From: Jian Zhao <jian.j.zhao@intel.com>
Date: Tue, 13 Dec 2011 05:31:41 +0000 (+0800)
Subject: Add mismatch check for glGetTexImage or it will return -1 and may lead to segment... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=606d3a3c3de94665e47df47b48596293d588a420;p=mesa.git

Add mismatch check for glGetTexImage or it will return -1 and may lead to segment fault.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index ae0d51fbb29..3f24187292b 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -708,6 +708,14 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
       return GL_TRUE;
    }
 
+   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
+      /*GL_INVALID_OPERATION is generated by a format/type
+       * mismatch (see the 1.2 spec page 94, sec 3.6.4.)
+       */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(target)");
+      return GL_TRUE;
+   }
+
    baseFormat = _mesa_get_format_base_format(texImage->TexFormat);
       
    /* Make sure the requested image format is compatible with the