From 427b2f41a6e21140fde1ccd900ed228de672ce33 Mon Sep 17 00:00:00 2001 From: "Bi, Dandan" Date: Tue, 9 Jan 2018 15:24:44 +0800 Subject: [PATCH] MdeModulePkg/VarCheckHii: Update data type for variable "ArrayIndex" In some case the ArrayIndex with UINT16 may be not large enough to hold the multiplication result of HiiQuestion->VarOffset * 8; So this patch update the data type to fix this potential issue. Cc: Star Zeng Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi Reviewed-by: Star Zeng --- MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c index 0db1383491..debabb5a47 100644 --- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c +++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c @@ -1,7 +1,7 @@ /** @file Var Check Hii bin generation. -Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -515,7 +515,7 @@ MergeHiiQuestion ( UINT8 *Ptr; UINT8 *Ptr1; UINT8 *Ptr2; - UINT16 ArrayIndex; + UINTN ArrayIndex; // // Hii Question from Hii Database has high priority. @@ -1064,7 +1064,7 @@ ParseHiiQuestion ( ) { VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion; - UINT16 ArrayIndex; + UINTN ArrayIndex; // // Currently only OneOf, CheckBox and Numeric can be stored in bit field.