From bf97ca448cce48e63e9edcc25ada18ce47cdd11e Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 15 Feb 2008 13:41:21 -0700
Subject: [PATCH] Fix glBindTexture crash (bug 14514)

---
 docs/relnotes-7.0.3.html | 1 +
 src/mesa/main/texobj.c   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html
index 2f9e59d90c8..26eed3ca656 100644
--- a/docs/relnotes-7.0.3.html
+++ b/docs/relnotes-7.0.3.html
@@ -35,6 +35,7 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
 <li>Fixed GLX indirect vertex array rendering bug (14197)
 <li>Fixed crash when deleting framebuffer objects (bugs 13507, 14293)
 <li>User-defined clip planes enabled for R300 (bug 9871)
+<li>Fixed glBindTexture() crash upon bad target (bug 14514)
 </ul>
 
 
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 7b36154a5e5..f385f8112cf 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -854,7 +854,8 @@ _mesa_BindTexture( GLenum target, GLuint texName )
             newTexObj = ctx->Shared->DefaultRect;
             break;
          default:
-            ; /* Bad targets are caught above */
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
+            return;
       }
    }
    else {
@@ -926,6 +927,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
          _mesa_reference_texobj(&texUnit->CurrentRect, newTexObj);
          break;
       default:
+         /* Bad target should be caught above */
          _mesa_problem(ctx, "bad target in BindTexture");
          return;
    }