MdeModulePkg: Check for NULL pointer before dereference it.

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 00f4b4136c160d224304fe3f75d31be1d901a8b2..754781457501e0f6577a4f8469fa21caf02d838a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -181,7 +181,7 @@ UiFindMenuList (
     // Find the same FromSet.\r
     //\r
     if (MenuList->HiiHandle == HiiHandle) {\r
-      if (CompareGuid (&MenuList->FormSetGuid, &gZeroGuid)) {\r
+      if (IsZeroGuid (&MenuList->FormSetGuid)) {\r
         //\r
         // FormSetGuid is not specified.\r
         //\r
@@ -938,7 +938,7 @@ InitializeSetup (
   \r
   Status = gBS->InstallProtocolInterface (\r
                   &mPrivateData.Handle,\r
-                  &gEfiFormBrowserExProtocolGuid,\r
+                  &gEdkiiFormBrowserExProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &mPrivateData.FormBrowserEx\r
                   );\r
@@ -3275,6 +3275,7 @@ SubmitForForm (
 \r
         Status = EFI_SUCCESS;\r
       }\r
+      SendDiscardInfoToDriver (FormSet,Form);\r
     } else {\r
       Status = EFI_UNSUPPORTED;\r
     }\r
@@ -3336,9 +3337,11 @@ SubmitForFormSet (
   BOOLEAN                 HasInserted;\r
   FORM_BROWSER_STATEMENT  *Question;\r
   BOOLEAN                 SubmitFormSetFail;\r
+  BOOLEAN                 DiscardChange;\r
 \r
   HasInserted = FALSE;\r
   SubmitFormSetFail = FALSE;\r
+  DiscardChange     = FALSE;\r
 \r
   if (!IsNvUpdateRequiredForFormSet (FormSet)) {\r
     return EFI_SUCCESS;\r
@@ -3439,6 +3442,7 @@ SubmitForFormSet (
       // If not in system level, just handl the save failed storage here.\r
       //\r
       if (ConfirmSaveFail (Form->FormTitle, FormSet->HiiHandle) == BROWSER_ACTION_DISCARD) {\r
+        DiscardChange = TRUE;\r
         Link = GetFirstNode (&FormSet->SaveFailStorageListHead);\r
         while (!IsNull (&FormSet->SaveFailStorageListHead, Link)) {\r
           FormSetStorage = FORMSET_STORAGE_FROM_SAVE_FAIL_LINK (Link);\r
@@ -3487,6 +3491,21 @@ SubmitForFormSet (
     }\r
   }\r
 \r
+  //\r
+  // If user discard the change, send the discard info to driver.\r
+  //\r
+  if (DiscardChange) {\r
+    Link = GetFirstNode (&FormSet->FormListHead);\r
+    while (!IsNull (&FormSet->FormListHead, Link)) {\r
+      Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
+      Link = GetNextNode (&FormSet->FormListHead, Link);\r
+      //\r
+      // Call callback with Changed type to inform the driver.\r
+      //\r
+      SendDiscardInfoToDriver (FormSet, Form);\r
+    }\r
+  }\r
+\r
   //\r
   // 5. Update the NV flag.\r
   // \r
@@ -3606,6 +3625,16 @@ SubmitForSystem (
         }\r
       }\r
 \r
+      Link = GetFirstNode (&LocalFormSet->FormListHead);\r
+      while (!IsNull (&LocalFormSet->FormListHead, Link)) {\r
+        Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
+        Link = GetNextNode (&LocalFormSet->FormListHead, Link);\r
+        //\r
+        // Call callback with Changed type to inform the driver.\r
+        //\r
+        SendDiscardInfoToDriver (LocalFormSet, Form);\r
+      }\r
+\r
       if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) {\r
         CleanBrowserStorage(LocalFormSet);\r
         RemoveEntryList (&LocalFormSet->Link);\r
@@ -5689,7 +5718,7 @@ GetIfrBinaryData (
           //\r
           // Try to compare against formset GUID\r
           //\r
-          if (CompareGuid (FormSetGuid, &gZeroGuid) || \r
+          if (IsZeroGuid (FormSetGuid) ||\r
               CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {\r
             break;\r
           }\r