3 files changed, 5 insertions, 1 deletions
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) {