2 files changed, 7 insertions, 6 deletions
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
index d6c6686351..2be925d236 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
@@ -846,6 +846,7 @@ UpdateVariableCache (
           // If size of data changes, allocate pool and copy data.
           //
           Entry->Data = AllocatePool (DataSize);
+          ASSERT (Entry->Data != NULL);
           Entry->DataSize = DataSize;
           CopyMem (Entry->Data, Data, DataSize);
         }
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
index df8b30a63e..0846b2a21b 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
@@ -1591,12 +1591,11 @@ UpdateVariable (
   NextVariable->MonotonicCount  = MonotonicCount;
   SetMem (&NextVariable->TimeStamp, sizeof (EFI_TIME), 0);
 
-  if (((Attributes & EFI_VARIABLE_APPEND_WRITE) == 0) && 
-      ((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0)) {
-    CopyMem (&NextVariable->TimeStamp, TimeStamp, sizeof (EFI_TIME));
-  } else if (
-      ((Attributes & EFI_VARIABLE_APPEND_WRITE) != 0) && 
-      ((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0)) {
+  if (((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0) &&
+        TimeStamp != NULL) {
+    if ((Attributes & EFI_VARIABLE_APPEND_WRITE) == 0) {
+      CopyMem (&NextVariable->TimeStamp, TimeStamp, sizeof (EFI_TIME));
+    } else {
       //
       // In the case when the EFI_VARIABLE_APPEND_WRITE attribute is set, only
       // when the new TimeStamp value is later than the current timestamp associated
@@ -1605,6 +1604,7 @@ UpdateVariable (
       if (CompareTimeStamp (&Variable->CurrPtr->TimeStamp, TimeStamp)) {
         CopyMem (&NextVariable->TimeStamp, TimeStamp, sizeof (EFI_TIME));
       }
+    }
   }
 
   //