X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel2CommandsLib%2FMv.c;h=a62878175701e66c343a6b6d451b59f122f72dba;hp=adb6f9975902d4e53ae4e8f0e211bc756e29b300;hb=9ea69f8a05b808b4bab81b608436a02e2f2fba09;hpb=d38a107995ef90254713dcebf8f6bddb70183a1e

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index adb6f99759..a628781757 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -152,6 +152,10 @@ GetDestinationLocation(
       NewSize = StrSize(Cwd);
       NewSize += StrSize(DestDir);
       DestPath = AllocateZeroPool(NewSize);
+      if (DestPath == NULL) {
+        ShellCloseFileMetaArg(&DestList);
+        return (SHELL_OUT_OF_RESOURCES);
+      }
       StrCpy(DestPath, Cwd);
       if (DestPath[StrLen(DestPath)-1] != L'\\' && DestDir[0] != L'\\') {
         StrCat(DestPath, L"\\");
@@ -162,6 +166,10 @@ GetDestinationLocation(
     } else {
       ASSERT(DestPath == NULL);
       DestPath = StrnCatGrow(&DestPath, NULL, DestDir, 0);
+      if (DestPath == NULL) {
+        ShellCloseFileMetaArg(&DestList);
+        return (SHELL_OUT_OF_RESOURCES);
+      }
     }
   } else {
     Node = (EFI_SHELL_FILE_INFO*)GetFirstNode(&DestList->Link);
@@ -175,6 +183,10 @@ GetDestinationLocation(
     }
     if (ShellIsDirectory(Node->FullName)==EFI_SUCCESS) {
       DestPath = AllocateZeroPool(StrSize(Node->FullName)+sizeof(CHAR16));
+      if (DestPath == NULL) {
+        ShellCloseFileMetaArg(&DestList);
+        return (SHELL_OUT_OF_RESOURCES);
+      }
       StrCpy(DestPath, Node->FullName);
       StrCat(DestPath, L"\\");
     } else {
@@ -287,62 +299,66 @@ ValidateAndMoveFiles(
     NewSize = StrSize(DestPath);
     NewSize += StrSize(Node->FileName) + sizeof(EFI_FILE_INFO) + sizeof(CHAR16);
     NewFileInfo = AllocateZeroPool(NewSize);
-    ASSERT(NewFileInfo != NULL);
-    CopyMem(NewFileInfo, Node->Info, sizeof(EFI_FILE_INFO));
-    if (DestPath[0] != L'\\') {
-      StrCpy(NewFileInfo->FileName, L"\\");
-      StrCat(NewFileInfo->FileName, DestPath);
+    if (NewFileInfo == NULL) {
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);
+      ShellStatus = SHELL_OUT_OF_RESOURCES;
     } else {
-      StrCpy(NewFileInfo->FileName, DestPath);
-    }
-    if (NewFileInfo->FileName[StrLen(NewFileInfo->FileName)-1] == L'\\') {
-      if (Node->FileName[0] == L'\\') {
-        //
-        // Don't allow for double slashes. Eliminate one of them.
-        //
-        NewFileInfo->FileName[StrLen(NewFileInfo->FileName)-1] = CHAR_NULL;
+      CopyMem(NewFileInfo, Node->Info, sizeof(EFI_FILE_INFO));
+      if (DestPath[0] != L'\\') {
+        StrCpy(NewFileInfo->FileName, L"\\");
+        StrCat(NewFileInfo->FileName, DestPath);
+      } else {
+        StrCpy(NewFileInfo->FileName, DestPath);
       }
-      StrCat(NewFileInfo->FileName, Node->FileName);
-    }
-    NewFileInfo->Size = sizeof(EFI_FILE_INFO) + StrSize(NewFileInfo->FileName);
+      if (NewFileInfo->FileName[StrLen(NewFileInfo->FileName)-1] == L'\\') {
+        if (Node->FileName[0] == L'\\') {
+          //
+          // Don't allow for double slashes. Eliminate one of them.
+          //
+          NewFileInfo->FileName[StrLen(NewFileInfo->FileName)-1] = CHAR_NULL;
+        }
+        StrCat(NewFileInfo->FileName, Node->FileName);
+      }
+      NewFileInfo->Size = sizeof(EFI_FILE_INFO) + StrSize(NewFileInfo->FileName);
 
-    ShellPrintEx(-1, -1, HiiOutput, Node->FullName, NewFileInfo->FileName);
+      ShellPrintEx(-1, -1, HiiOutput, Node->FullName, NewFileInfo->FileName);
 
-    //
-    // Perform the move operation
-    //
-    Status = ShellSetFileInfo(Node->Handle, NewFileInfo);
+      //
+      // Perform the move operation
+      //
+      Status = ShellSetFileInfo(Node->Handle, NewFileInfo);
 
-    //
-    // Free the info object we used...
-    //
-    ASSERT  (NewFileInfo != NULL);
-    FreePool(NewFileInfo);
+      //
+      // Free the info object we used...
+      //
+      ASSERT  (NewFileInfo != NULL);
+      FreePool(NewFileInfo);
 
-    //
-    // Check our result
-    //
-    if (EFI_ERROR(Status)) {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);
       //
-      // move failed
+      // Check our result
       //
-      switch(Status){
-        default:
-          ShellStatus = SHELL_INVALID_PARAMETER;
-        case EFI_SECURITY_VIOLATION:
-          ShellStatus = SHELL_SECURITY_VIOLATION;
-        case EFI_WRITE_PROTECTED:
-          ShellStatus = SHELL_WRITE_PROTECTED;
-        case EFI_OUT_OF_RESOURCES:
-          ShellStatus = SHELL_OUT_OF_RESOURCES;
-        case EFI_DEVICE_ERROR:
-          ShellStatus = SHELL_DEVICE_ERROR;
-        case EFI_ACCESS_DENIED:
-          ShellStatus = SHELL_ACCESS_DENIED;
-      } // switch
-    } else {
-      ShellPrintEx(-1, -1, L"%s", HiiResultOk);
+      if (EFI_ERROR(Status)) {
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);
+        //
+        // move failed
+        //
+        switch(Status){
+          default:
+            ShellStatus = SHELL_INVALID_PARAMETER;
+          case EFI_SECURITY_VIOLATION:
+            ShellStatus = SHELL_SECURITY_VIOLATION;
+          case EFI_WRITE_PROTECTED:
+            ShellStatus = SHELL_WRITE_PROTECTED;
+          case EFI_OUT_OF_RESOURCES:
+            ShellStatus = SHELL_OUT_OF_RESOURCES;
+          case EFI_DEVICE_ERROR:
+            ShellStatus = SHELL_DEVICE_ERROR;
+          case EFI_ACCESS_DENIED:
+            ShellStatus = SHELL_ACCESS_DENIED;
+        } // switch
+      } else {
+        ShellPrintEx(-1, -1, L"%s", HiiResultOk);
+      }
     }
   } // for loop