3 files changed, 4 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index c42a18e3b0..2522d16deb 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -1122,6 +1122,7 @@ GetSelectionInputPopUp (
       Link = GetNextNode (&Question->OptionListHead, Link);
 
       StringPtr = GetToken (OneOfOption->Text, MenuOption->Handle);
+      ASSERT (StringPtr != NULL);
       //
       // If the string occupies multiple lines, truncate it to fit in one line,
       // and append a "..." for indication.
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 2fab5b79c9..c573fdbe15 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -533,6 +533,7 @@ DisplayForm (
 
     if (!Suppress) {
       StringPtr = GetToken (Statement->Prompt, Handle);
+      ASSERT (StringPtr != NULL);
 
       Width     = GetWidth (Statement, Handle);
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index 88a0590cf2..f97d91a2d6 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -502,6 +502,7 @@ ProcessOptions (
           Character[0] = LEFT_ONEOF_DELIMITER;
           NewStrCat (OptionString[0], Character);
           StringPtr = GetToken (OneOfOption->Text, Selection->Handle);
+          ASSERT (StringPtr != NULL);
           NewStrCat (OptionString[0], StringPtr);
           Character[0] = RIGHT_ONEOF_DELIMITER;
           NewStrCat (OptionString[0], Character);
@@ -599,6 +600,7 @@ ProcessOptions (
         Character[0] = LEFT_ONEOF_DELIMITER;
         NewStrCat (OptionString[0], Character);
         StringPtr = GetToken (OneOfOption->Text, Selection->Handle);
+        ASSERT (StringPtr != NULL);
         NewStrCat (OptionString[0], StringPtr);
         Character[0] = RIGHT_ONEOF_DELIMITER;
         NewStrCat (OptionString[0], Character);