add DataSize check to avoid PlatformLang/Lang variable is auto-mapped when try to...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9746 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index ee562d78c9166aacbc60d38b0ecdf102ef7365bd..6bf1d6ec7c0a47eda772881d48af1f482ff5e9ca 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -574,7 +574,7 @@ AutoUpdateLangVariable(
     // Therefore, in variable driver, only store the original value for other use.\r
     //\r
     AsciiStrnCpy (mVariableModuleGlobal->LangCodes, Data, DataSize);\r
-  } else if (StrCmp (VariableName, L"PlatformLang") == 0) {\r
+  } else if ((StrCmp (VariableName, L"PlatformLang") == 0) && (DataSize != 0)) {\r
     ASSERT (AsciiStrLen (mVariableModuleGlobal->PlatformLangCodes) != 0);\r
 \r
     //\r
@@ -604,7 +604,7 @@ AutoUpdateLangVariable(
 \r
     ASSERT_EFI_ERROR(Status);\r
 \r
-  } else if (StrCmp (VariableName, L"Lang") == 0) {\r
+  } else if ((StrCmp (VariableName, L"Lang") == 0) && (DataSize != 0)) {\r
     ASSERT (AsciiStrLen (mVariableModuleGlobal->LangCodes) != 0);\r
 \r
     //\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 99fd2351c2404896844c6a55542131a22e50a920..4f0ea3c4b703b6260a9b9be61bc25be3689dd1f9 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -1254,7 +1254,7 @@ AutoUpdateLangVariable(
     // Therefore, in variable driver, only store the original value for other use.\r
     //\r
     AsciiStrnCpy (mVariableModuleGlobal->LangCodes, Data, DataSize);\r
-  } else if (StrCmp (VariableName, L"PlatformLang") == 0) {\r
+  } else if ((StrCmp (VariableName, L"PlatformLang") == 0) && (DataSize != 0)) {\r
     ASSERT (AsciiStrLen (mVariableModuleGlobal->PlatformLangCodes) != 0);\r
 \r
     //\r
@@ -1284,7 +1284,7 @@ AutoUpdateLangVariable(
 \r
     ASSERT_EFI_ERROR(Status);\r
     \r
-  } else if (StrCmp (VariableName, L"Lang") == 0) {\r
+  } else if ((StrCmp (VariableName, L"Lang") == 0) && (DataSize != 0)) {\r
     ASSERT (AsciiStrLen (mVariableModuleGlobal->LangCodes) != 0);\r
 \r
     //\r