Sync patches r15425 and r15426 from main trunk.

1. Check the parameter before use it. 2. Add missing parameter comment in AddPubKeyInStore() Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan <[email protected]> git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@15429 6f19259b-4bc3-4df7-8a09-765794883524
gwli · Apr 3, 2014 · b40ceff · b40ceff
1 parent 9cd718c
commit b40ceff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
@@ -1,7 +1,7 @@
 /** @file
   Support functions to connect/disconnect UEFI Driver model Protocol
 
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 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
@@ -85,6 +85,7 @@ CoreConnectController (
     //
     Status = CoreHandleProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid, (VOID **)&HandleFilePath);
     if (!EFI_ERROR (Status)) {
+      ASSERT (HandleFilePath != NULL);
       FilePath     = HandleFilePath;
       TempFilePath = NULL;
       if (RemainingDevicePath != NULL && !Recursive) {

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
@@ -416,6 +416,7 @@ AutenticatedVariableServiceInitialize (
   Add public key in store and return its index.
 
   @param[in]  PubKey                  Input pointer to Public Key data
+  @param[in]  VariableDataEntry       The variable data entry 
 
   @return                             Index of new added item