radeon_hd: Fix array bounds check in encoder_name_lookup

haiku · Sep 26, 2014 · 69acb96 · 69acb96
1 parent 2a5e33a
commit 69acb96
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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";