Add in ASSERT to check out-of-bound and possible dereference of NULL pointers.

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / InputHandler.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index d122aec56917eb0695bc1e88eeccb4dd04eae5db..1bf770434346800301ed994345dc144e8834066f 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -387,7 +387,7 @@ GetNumericInput (
 \r
     InputText[0] = LEFT_NUMERIC_DELIMITER;\r
     SetUnicodeMem (InputText + 1, InputWidth, L' ');\r
-    ASSERT (InputWidth < MAX_NUMERIC_INPUT_WIDTH); \r
+    ASSERT (InputWidth + 2 < MAX_NUMERIC_INPUT_WIDTH); \r
     InputText[InputWidth + 1] = RIGHT_NUMERIC_DELIMITER;\r
     InputText[InputWidth + 2] = L'\0';\r
 \r
@@ -649,6 +649,7 @@ EnterCarriageReturn:
         }\r
 \r
         Count++;\r
+        ASSERT (Count < (sizeof (PreviousNumber) / sizeof (PreviousNumber[0])));\r
         PreviousNumber[Count] = EditValue;\r
 \r
         PrintCharAt (Column, Row, Key.UnicodeChar);\r