From 69acb96d8ef78c2a4039724e38d422fe12939ae3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 26 Sep 2014 08:16:07 -0400 Subject: [PATCH] radeon_hd: Fix array bounds check in encoder_name_lookup --- src/add-ons/accelerants/radeon_hd/encoder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/encoder.cpp b/src/add-ons/accelerants/radeon_hd/encoder.cpp index 5af560ed6c..d14cd60cc8 100644 --- a/src/add-ons/accelerants/radeon_hd/encoder.cpp +++ b/src/add-ons/accelerants/radeon_hd/encoder.cpp @@ -1966,8 +1966,8 @@ encoder_output_lock(bool lock) Write32(OUT, R600_SCRATCH_REG6, biosScratch6); } - -static const char* encoder_name_matrix[37] = { +static const uint32 ENCODER_NAME_MATRIX_SIZE = 37; +static const char* encoder_name_matrix[ENCODER_NAME_MATRIX_SIZE] = { "NONE", "Internal Radeon LVDS", "Internal Radeon TMDS1", @@ -2010,7 +2010,7 @@ static const char* encoder_name_matrix[37] = { const char* encoder_name_lookup(uint32 encoderID) { - if (encoderID <= sizeof(encoder_name_matrix)) + if (encoderID < ENCODER_NAME_MATRIX_SIZE) return encoder_name_matrix[encoderID]; else return "Unknown";