From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 18 Nov 2015 02:35:00 +0000 (-0800)
Subject: glsl: Fix off-by-one error in array size check assertion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f554761536bbfd0d8ec22e807c18bd6df0f22b8;p=mesa.git

glsl: Fix off-by-one error in array size check assertion

Apparently, this has been a bug since 2010 (c30f6e5d).

Also use ARRAY_SIZE instead of open coding it.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: mesa-stable@lists.freedesktop.org
---

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 8b5ba71fbba..80cbdbf613f 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -1425,8 +1425,7 @@ static const char * const tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf
 
 const char *ir_texture::opcode_string()
 {
-   assert((unsigned int) op <=
-	  sizeof(tex_opcode_strs) / sizeof(tex_opcode_strs[0]));
+   assert((unsigned int) op < ARRAY_SIZE(tex_opcode_strs));
    return tex_opcode_strs[op];
 }