Merge R8 tracker #8374 to make EmuVariable.GetNextVariableName() comply with UEFI...

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

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
index 6614bb03e9b1ae4d64e816590f596bdc0b3db1d8..fe1ac92b63589a92b7725545962dc9db785b6c80 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
@@ -413,7 +413,7 @@ Returns:
   UINTN                   VarNameSize;\r
   EFI_STATUS              Status;\r
 \r
-  if (VariableNameSize == NULL || VendorGuid == NULL) {\r
+  if (VariableNameSize == NULL || VariableName == NULL || VendorGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r