From 8d4bd87c1ad8db33b7cb7eae309abf36f14986d8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 12 Sep 2000 21:09:24 +0000
Subject: added format/type error check to draw_rgba_pixels()

---
 src/mesa/main/drawpix.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 7cf7b0030f..bfc4a59aa4 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.33 2000/09/08 21:28:04 brianp Exp $ */
+/* $Id: drawpix.c,v 1.34 2000/09/12 21:09:24 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -713,6 +713,11 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
    GLfloat *convImage = NULL;
    GLuint transferOps = ctx->ImageTransferState;
 
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      gl_error(ctx, GL_INVALID_ENUM, "glDrawPixels(format or type)");
+      return;
+   }
+
    /* Try an optimized glDrawPixels first */
    if (fast_draw_pixels(ctx, x, y, width, height, format, type, pixels))
       return;
-- 
cgit v1.2.3