Refine code to fix potential code bug.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14949 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 69b740ad5b60a982820c610a29e70dd36d8b87af..0b2138ce64b6a1670221ab8ccd25ea10d95057ae 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -1287,7 +1287,7 @@ IsThisVarstore (
   //\r
   // If ConfigHdr has name field and varstore not has name, return FALSE.\r
   //\r
-  if (Name == NULL && StrStr (ConfigHdr, L"NAME=&") == NULL) {\r
+  if (Name == NULL && ConfigHdr != NULL && StrStr (ConfigHdr, L"NAME=&") == NULL) {\r
     return FALSE;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index ce2ba6fab27d3f5c66f4a616f391bf8a1bde1737..75947d302eb6c4bc66c234ce0140a2fb8d718e57 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -379,12 +379,18 @@ FindStorageInList (
   Link  = GetFirstNode (&gBrowserStorageList);\r
   while (!IsNull (&gBrowserStorageList, Link)) {\r
     BrowserStorage = BROWSER_STORAGE_FROM_LINK (Link);\r
+    Link = GetNextNode (&gBrowserStorageList, Link);\r
 \r
     if ((BrowserStorage->Type == StorageType) && CompareGuid (&BrowserStorage->Guid, StorageGuid)) {\r
-      if (StorageType == EFI_HII_VARSTORE_NAME_VALUE && BrowserStorage->HiiHandle == HiiHandle) {\r
-        return BrowserStorage;\r
+      if (StorageType == EFI_HII_VARSTORE_NAME_VALUE) {\r
+        if (BrowserStorage->HiiHandle == HiiHandle) {\r
+          return BrowserStorage;\r
+        }\r
+\r
+        continue;\r
       }\r
 \r
+      ASSERT (StorageName != NULL);\r
       if (StrCmp (BrowserStorage->Name, StorageName) == 0) {\r
         if (StorageType == EFI_HII_VARSTORE_EFI_VARIABLE || StorageType == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
           return BrowserStorage;\r
@@ -393,11 +399,6 @@ FindStorageInList (
         }\r
       }\r
     }\r
-\r
-    //\r
-    // Get Next Storage.\r
-    //\r
-    Link = GetNextNode (&gBrowserStorageList, Link);\r
   }\r
 \r
   return NULL;\r