X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FEmuVariable%2FRuntimeDxe%2FEmuVariable.c;h=b44da1c47486c09a5abc0f738b5bfb69b1dfb56d;hp=bfb499ab653277f574c00936f9dcfc675e7db3bb;hb=35d02d76bffba0b2ab598ac1151cc02e47ad197e;hpb=09d4dd14e9281f125de3090acbfbff1d1aa05756

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
index bfb499ab65..b44da1c474 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
@@ -336,8 +336,12 @@ Returns:
   //
   VarDataSize = Variable.CurrPtr->DataSize;
   if (*DataSize >= VarDataSize) {
+    if (Data == NULL) {
+      return EFI_INVALID_PARAMETER;
+    }
+
     CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);
-    if (Attributes) {
+    if (Attributes != NULL) {
       *Attributes = Variable.CurrPtr->Attributes;
     }
 
@@ -382,7 +386,7 @@ Returns:
   UINTN                   VarNameSize;
   EFI_STATUS              Status;
 
-  if (VariableNameSize == NULL || VendorGuid == NULL) {
+  if (VariableNameSize == NULL || VariableName == NULL || VendorGuid == NULL) {
     return EFI_INVALID_PARAMETER;
   }