diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2014-04-03 00:56:45 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-04-03 00:56:45 +0000 |
| commit | b40ceff6e274d71e7dc09e6bda2a2b72a082e5f7 (patch) | |
| tree | a12d5c0619fa4b6b1b07d4cfbed5024e23674ea7 | |
| parent | 9cd718c0f183db4cf7c1f5f2dc40f6de612a1835 (diff) | |
| download | edk2-b40ceff6e274d71e7dc09e6bda2a2b72a082e5f7.tar.gz | |
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 <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@15429 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdeModulePkg/Core/Dxe/Hand/DriverSupport.c | 3 | ||||
| -rw-r--r-- | SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c index ded635632b..92218ee7aa 100644 --- 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 index f83ed88057..991bb8708c 100644 --- 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
|