X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FHotkey.c;h=99c3306ec9985fcd4aa58f024a8b94a22a12fe7f;hp=3ce9c0ebad6753a6a4150b14686a3fe717f060fe;hb=7ec9caab9293a06129cdeceda40db94f0b37eb9e;hpb=6ba0bc7c4ec0aa1df5ca5c5ac788ad6516eaa2ee

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index 3ce9c0ebad..99c3306ec9 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@@ -349,7 +349,7 @@ HotkeyCallback (
     HotkeyData = &Hotkey->KeyData[Hotkey->WaitingKey];
     if ((KeyData->Key.ScanCode == HotkeyData->Key.ScanCode) &&
        (KeyData->Key.UnicodeChar == HotkeyData->Key.UnicodeChar) &&
-       ((HotkeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) ? (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE)) {
+       (((HotkeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ? (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE)) {
       //
       // Receive an expecting key stroke
       //
@@ -469,7 +469,7 @@ HotkeyRegisterNotify (
         return Status;
       }
       Index ++;
-    } while (Index < Hotkey->CodeCount);
+    } while ((Index < Hotkey->CodeCount) && (Index < (sizeof (Hotkey->KeyData) / sizeof (EFI_KEY_DATA))));
 
     Link = GetNextNode (&mHotkeyList, Link);
   }