2 files changed, 5 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 8aced87c85..79829e6643 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -815,7 +815,7 @@ GetToken (
 
   String = HiiGetString (HiiHandle, Token, NULL);
   if (String == NULL) {
-    String = AllocateCopyPool (sizeof (mUnknownString), mUnknownString);
+    String = AllocateCopyPool (StrSize (mUnknownString), mUnknownString);
     ASSERT (String != NULL);
   }
   return (CHAR16 *) String;
@@ -3269,7 +3269,7 @@ ExtractDefault (
       //
       // Initilize Questions' Value
       //
-      LoadFormSetConfig (NULL, LocalFormSet);
+      Status = LoadFormSetConfig (NULL, LocalFormSet);
       if (EFI_ERROR (Status)) {
         DestroyFormSet (LocalFormSet);
         continue;
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index f48afbf66c..f3019a8408 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -957,6 +957,9 @@ CreateDialog (
           TempString[Index - 1] = CHAR_NULL;
           StrCpy (StringBuffer, TempString);
         }
+        //
+        // break skipped on purpose
+        //
 
       default:
         //