summaryrefslogtreecommitdiff
path: root/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
diff options
context:
space:
mode:
authorQiu Shumin <shumin.qiu@intel.com>2015-12-18 07:40:05 +0000
committervanjeff <vanjeff@Edk2>2015-12-18 07:40:05 +0000
commitbd3445a74754f3eeda9d2f2cc89803c27f046531 (patch)
tree2d509640db98bb8d2dda955aa6ce86f10a92678e /ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
parent1d8a8d09eef4028fee03ab9660aab9398ebe6675 (diff)
downloadedk2-platforms-bd3445a74754f3eeda9d2f2cc89803c27f046531.tar.xz
ShellPkg: Initialize the local pointer to avoid potential suspicious dereference.
1. Initialize the local pointer 'HandleBuffer'. 2. When 'LocateHandleBuffer' return error 'HandleBuffer' is expected unchanged, add code make sure this. (Sync patch r19229 from main trunk.) Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin <shumin.qiu@intel.com> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19410 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c')
-rw-r--r--ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
index 3f08cc84dc..7b26e4d27f 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
@@ -317,6 +317,7 @@ ShellMmLocateIoProtocol (
}
*PciRootBridgeIo = NULL;
+ HandleBuffer = NULL;
Status = gBS->LocateHandleBuffer (
ByProtocol,
&gEfiPciRootBridgeIoProtocolGuid,
@@ -324,7 +325,7 @@ ShellMmLocateIoProtocol (
&HandleCount,
&HandleBuffer
);
- if (EFI_ERROR (Status) || (HandleCount == 0)) {
+ if (EFI_ERROR (Status) || (HandleCount == 0) || (HandleBuffer == NULL)) {
return FALSE;
}