summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2015-06-22 11:20:32 -0700
committerMatt Turner <mattst88@gmail.com>2015-06-23 12:24:42 -0700
commitd8eeb4917ca39a0698731f64933c85a7c44e9247 (patch)
treecdaa7e6a1952e5ae0bb98c36258c099bffa90900
parent4d93a07c45c8aa4cb3adbfcb9d61dcb54d8c404f (diff)
downloadexternal_mesa3d-d8eeb4917ca39a0698731f64933c85a7c44e9247.zip
external_mesa3d-d8eeb4917ca39a0698731f64933c85a7c44e9247.tar.gz
external_mesa3d-d8eeb4917ca39a0698731f64933c85a7c44e9247.tar.bz2
i965: Assert that the GL primitive isn't out of range.
Coverity sees the if (mode >= BRW_PRIM_OFFSET (128)) test and assumes that the else-branch might execute for mode to up 127, which out be out of bounds. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index a7164db..b91597a 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -92,8 +92,10 @@ get_hw_prim_for_gl_prim(int mode)
{
if (mode >= BRW_PRIM_OFFSET)
return mode - BRW_PRIM_OFFSET;
- else
+ else {
+ assert(mode < ARRAY_SIZE(prim_to_hw_prim));
return prim_to_hw_prim[mode];
+ }
}