From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 18 Nov 2003 03:42:17 +0000 (+0000)
Subject: added missing <type> error checking in read_index_pixels()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10b09212e8e3adc1751ae32bb632ad9bd8287c64;p=mesa.git

added missing <type> error checking in read_index_pixels()
---

diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 00aa43d07cc..f2b91e05282 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  5.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -61,6 +60,17 @@ read_index_pixels( GLcontext *ctx,
       return;
    }
 
+   if (type != GL_BYTE &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_INT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_FLOAT) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels(index type)");
+      return;
+   }
+
    _swrast_use_read_buffer(ctx);
 
    readWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width;