ShellPkg/Dp: Add null pointer check

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Rm.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index 9d55b6f2636f85a3a090720a969baf2acbcf06af..288e7666a819ef9f903a079a149f993398ed3f51 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
@@ -1,8 +1,8 @@
 /** @file\r
   Main file for attrib shell level 2 function.\r
 \r
-  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -29,11 +29,11 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   @retval FALSE The directory has at least 1 file or directory in it.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsDirectoryEmpty (\r
   IN EFI_HANDLE   FileHandle\r
   )\r
 {\r
+  EFI_STATUS      Status;\r
   EFI_FILE_INFO   *FileInfo;\r
   BOOLEAN         NoFile;\r
   BOOLEAN         RetVal;\r
@@ -42,8 +42,8 @@ IsDirectoryEmpty (
   NoFile = FALSE;\r
   FileInfo = NULL;\r
 \r
-  for (FileHandleFindFirstFile(FileHandle, &FileInfo)\r
-    ;  !NoFile\r
+  for (Status = FileHandleFindFirstFile(FileHandle, &FileInfo)\r
+    ;  !NoFile && !EFI_ERROR (Status)\r
     ;  FileHandleFindNextFile(FileHandle, FileInfo, &NoFile)\r
    ){\r
     if (StrStr(FileInfo->FileName, L".") != FileInfo->FileName\r
@@ -66,7 +66,6 @@ IsDirectoryEmpty (
   @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CascadeDelete(\r
   IN EFI_SHELL_FILE_INFO  *Node,\r
   IN CONST BOOLEAN        Quiet\r
@@ -132,9 +131,9 @@ CascadeDelete(
           if (TempName == NULL) {\r
             ShellStatus = SHELL_OUT_OF_RESOURCES;\r
           } else {\r
-            StrnCpy(TempName, Node->FullName, NewSize/sizeof(CHAR16) -1);\r
+            StrCpyS(TempName, NewSize/sizeof(CHAR16), Node->FullName);\r
             TempName[StrStr(TempName, L":")+1-TempName] = CHAR_NULL;\r
-            StrnCat(TempName, Node2->FullName, NewSize/sizeof(CHAR16) -1 - StrLen(TempName));\r
+            StrCatS(TempName, NewSize/sizeof(CHAR16), Node2->FullName);\r
             FreePool((VOID*)Node2->FullName);\r
             Node2->FullName = TempName;\r
 \r
@@ -188,14 +187,13 @@ CascadeDelete(
 }\r
 \r
 /**\r
-  Determins if a Node is a valid delete target.  Will prevent deleting the root directory.\r
+  Determines if a Node is a valid delete target.  Will prevent deleting the root directory.\r
 \r
   @param[in] List       RESERVED.  Not used.\r
   @param[in] Node       The node to analyze.\r
   @param[in] Package    RESERVED.  Not used.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidDeleteTarget(\r
   IN CONST EFI_SHELL_FILE_INFO  *List,\r
   IN CONST EFI_SHELL_FILE_INFO  *Node,\r
@@ -231,7 +229,9 @@ IsValidDeleteTarget(
   Pattern       = NULL;\r
   SearchString  = NULL;\r
   Size          = 0;\r
-  Pattern       = StrnCatGrow(&Pattern     , NULL, TempLocation  , 0);\r
+  Pattern       = StrnCatGrow(&Pattern, &Size, TempLocation  , 0);\r
+  Pattern       = StrnCatGrow(&Pattern, &Size, L"\\"  , 0);\r
+  Size = 0;\r
   SearchString  = StrnCatGrow(&SearchString, &Size, Node->FullName, 0);\r
   if (!EFI_ERROR(ShellIsDirectory(SearchString))) {\r
     SearchString  = StrnCatGrow(&SearchString, &Size, L"\\", 0);\r