4 files changed, 12 insertions, 3 deletions
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
index 07a41b06f8..2663dbe063 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
@@ -2122,6 +2122,7 @@ VerifyTimeBasedPayload (
   WrapSigData            = NULL;
   SignerCerts            = NULL;
   RootCert               = NULL;
+  CertsInCertDb          = NULL;
 
   //
   // When the attribute EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS is
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c
index b20facd9d8..d79cd36b0d 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c
@@ -2,7 +2,7 @@
   Handles non-volatile variable store garbage collection, using FTW
   (Fault Tolerant Write) protocol.
 
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD License 
 which accompanies this distribution.  The full text of the license may be found at 
@@ -48,7 +48,8 @@ GetLbaAndOffsetByAddress (
 
   *Lba    = (EFI_LBA) (-1);
   *Offset = 0;
-  
+  Fvb = NULL;
+
   //
   // Get the proper FVB protocol.
   //
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
index 6a33a78da4..6b9ca960b6 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
@@ -3881,6 +3881,7 @@ GetFvbInfoByAddress (
   EFI_FIRMWARE_VOLUME_HEADER              *FwVolHeader;
   EFI_FVB_ATTRIBUTES_2                    Attributes;
 
+  HandleBuffer = NULL;
   //
   // Get all FVB handles.
   //
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c
index f550c67bee..7f4380be42 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c
@@ -13,7 +13,7 @@
 
   InitCommunicateBuffer() is really function to check the variable data size.
 
-Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD License 
 which accompanies this distribution.  The full text of the license may be found at 
@@ -222,6 +222,7 @@ VariableLockRequestToLock (
   }
 
   VariableNameSize = StrSize (VariableName);
+  VariableToLock   = NULL;
 
   //
   // If VariableName exceeds SMM payload limit. Return failure
@@ -302,6 +303,7 @@ RuntimeServiceGetVariable (
 
   TempDataSize          = *DataSize;
   VariableNameSize      = StrSize (VariableName);
+  SmmVariableHeader     = NULL;
 
   //
   // If VariableName exceeds SMM payload limit. Return failure
@@ -404,6 +406,7 @@ RuntimeServiceGetNextVariableName (
 
   OutVariableNameSize   = *VariableNameSize;
   InVariableNameSize    = StrSize (VariableName);
+  SmmGetNextVariableName = NULL;
 
   //
   // If input string exceeds SMM payload limit. Return failure
@@ -523,6 +526,7 @@ RuntimeServiceSetVariable (
   }
 
   VariableNameSize      = StrSize (VariableName);
+  SmmVariableHeader     = NULL;
 
   //
   // If VariableName or DataSize exceeds SMM payload limit. Return failure
@@ -602,6 +606,8 @@ RuntimeServiceQueryVariableInfo (
   UINTN                                     PayloadSize;
   SMM_VARIABLE_COMMUNICATE_QUERY_VARIABLE_INFO *SmmQueryVariableInfo;
 
+  SmmQueryVariableInfo = NULL;
+
   if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL || Attributes == 0) {
     return EFI_INVALID_PARAMETER;
   }