Module: Mesa Branch: master Commit: 2f554761536bbfd0d8ec22e807c18bd6df0f22b8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f554761536bbfd0d8ec22e807c18bd6df0f22b8
Author: Ian Romanick <[email protected]> Date: Tue Nov 17 18:35:00 2015 -0800 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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Cc: [email protected] --- src/glsl/ir.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 8b5ba71..80cbdbf 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]; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
