Get the language string before use it to avoid reuse freed buffer.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / FrontPage.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index da0e17b38daab41e88c0fe3f8254ae2f9fb6217f..432b22469ec535a52ddef442af6a4f660fd58aa5 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -399,10 +399,10 @@ InitializeFrontPage (
 \r
   CurrentLang = GetEfiGlobalVariable (L"PlatformLang");\r
 \r
-  if (gFrontPagePrivate.LanguageToken == NULL) {\r
-    //\r
-    // Get Support language list from variable.\r
-    //\r
+  //\r
+  // Get Support language list from variable.\r
+  //\r
+  if (mLanguageString == NULL){\r
     mLanguageString = GetEfiGlobalVariable (L"PlatformLangCodes");\r
     if (mLanguageString == NULL) {\r
       mLanguageString = AllocateCopyPool (\r
@@ -411,7 +411,9 @@ InitializeFrontPage (
                                  );\r
       ASSERT (mLanguageString != NULL);\r
     }\r
+  }\r
 \r
+  if (gFrontPagePrivate.LanguageToken == NULL) {\r
     //\r
     // Count the language list number.\r
     //  \r
@@ -1223,6 +1225,7 @@ PlatformBdsEnterFrontPage (
 \r
   if (mLanguageString != NULL) {\r
     FreePool (mLanguageString);\r
+    mLanguageString = NULL;\r
   }\r
   //\r
   //Will leave browser, check any reset required change is applied? if yes, reset system\r