From 532691c8ba90e5022174503ab0781322c6f79cab Mon Sep 17 00:00:00 2001
From: jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 14 Oct 2011 19:21:13 +0000
Subject: ShellPkg: Add checking for memory allocation and pointer returns from
 functions.

signed-off-by: jcarsey
reviewed-by: geekboy15a

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12540 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c                     | 2 +-
 ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c        | 1 +
 .../Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c    | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'ShellPkg/Library/UefiShellDebug1CommandsLib')

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index de2ce2bfc3..ffd05b8ba3 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -978,7 +978,7 @@ ShellCommandRunBcfg (
           ShellStatus = BcfgAddDebug1(
             CurrentOperation.Number1,
             CurrentOperation.FileName,
-            CurrentOperation.Description,
+            CurrentOperation.Description==NULL?L"":CurrentOperation.Description,
             CurrentOperation.Order,
             Length / sizeof(CurrentOperation.Order[0]),
             CurrentOperation.Target,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
index f5fb7d262a..ff3819c6c6 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
@@ -178,6 +178,7 @@ HFileImageRead (
 
     StatusBarSetStatusString (UnicodeBuffer);
     FreePool (UnicodeBuffer);
+    return EFI_OUT_OF_RESOURCES;
   }
 
   HFileImageSetFileName (FileName);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 9ab5d89748..945002a2ea 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -303,6 +303,9 @@ ConvertStringToGuid (
   } 
   TempCopy = NULL;
   TempCopy = StrnCatGrow(&TempCopy, NULL, StringGuid, 0);
+  if (TempCopy == NULL) {
+    return (EFI_OUT_OF_RESOURCES);
+  }
   Walker   = TempCopy;
   TempSpot = StrStr(Walker, L"-");
   if (TempSpot != NULL) {
-- 
cgit v1.2.3