2 files changed, 14 insertions, 5 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index b153d2fe45..69193d5efa 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
@@ -163,8 +163,8 @@ ShellLevel2CommandsLibDestructor (
   @param[in] Path         The unknown Path Value
 
   @retval NULL            A memory allocation failed
-  @retval NULL            a fully qualified path could not be discovered.
-  @retval other           pointer to a fuly qualified path.
+  @retval NULL            A fully qualified path could not be discovered.
+  @retval other           An allocated pointer to a fuly qualified path.
 **/
 CHAR16*
 EFIAPI
@@ -194,6 +194,10 @@ GetFullyQualifiedPath(
 
   PathCleanUpDirectories(PathToReturn);
 
+  if (PathTpReturn == NULL) {
+    return NULL;
+  }
+
   while (PathToReturn[StrLen(PathToReturn)-1] == L'*') {
     PathToReturn[StrLen(PathToReturn)-1] = CHAR_NULL;
   }
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 508e9e0ec0..d131f9b189 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -2865,9 +2865,10 @@ ShellPrintHiiEx(
 
   @param[in] DirName      Path to directory to test.
 
-  @retval EFI_SUCCESS     The Path represents a directory
-  @retval EFI_NOT_FOUND   The Path does not represent a directory
-  @return other           The path failed to open
+  @retval EFI_SUCCESS             The Path represents a directory
+  @retval EFI_NOT_FOUND           The Path does not represent a directory
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
+  @return                         The path failed to open
 **/
 EFI_STATUS
 EFIAPI
@@ -2892,6 +2893,10 @@ ShellIsDirectory(
     //
     if (gEfiShellProtocol != NULL) {
       TempLocation  = StrnCatGrow(&TempLocation, NULL, DirName, 0);
+      if (TempLocation == NULL) {
+        ShellCloseFile(&Handle);
+        return (EFI_OUT_OF_RESOURCES);
+      }
       TempLocation2 = StrStr(TempLocation, L":");
       if (TempLocation2 != NULL && StrLen(StrStr(TempLocation, L":")) == 2) {
         *(TempLocation2+1) = CHAR_NULL;