Merge R8 tracker #8375.

Make GetVariable() check Data parameter, and return EFI_INVALID_PARAMETER if it is NULL and DataSize is enough, according to UEFI spec.

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

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
index 093705c60dd60c00a4989be47909ce6be1e6260f..b44da1c47486c09a5abc0f738b5bfb69b1dfb56d 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
@@ -336,8 +336,12 @@ Returns:
   //\r
   VarDataSize = Variable.CurrPtr->DataSize;\r
   if (*DataSize >= VarDataSize) {\r
   //\r
   VarDataSize = Variable.CurrPtr->DataSize;\r
   if (*DataSize >= VarDataSize) {\r

+    if (Data == NULL) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+\r

     CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);\r
     CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);\r

-    if (Attributes) {\r
+    if (Attributes != NULL) {\r

       *Attributes = Variable.CurrPtr->Attributes;\r
     }\r
 \r
       *Attributes = Variable.CurrPtr->Attributes;\r
     }\r
 \r