3 files changed, 11 insertions, 7 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 52c1de8a96..efc14085c3 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -309,10 +309,11 @@ ValidateAndCopyFiles(
     Response = *Resp;
   }
 
-  DestPath    = NULL;
-  ShellStatus = SHELL_SUCCESS;
-  PathSize    = 0;
-  Cwd         = ShellGetCurrentDir(NULL);
+  DestPath         = NULL;
+  ShellStatus      = SHELL_SUCCESS;
+  PathSize         = 0;
+  Cwd              = ShellGetCurrentDir(NULL);
+  CleanFilePathStr = NULL;
 
   ASSERT(FileList != NULL);
   ASSERT(DestDir  != NULL);
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index fcf5f657b8..772cbd27f1 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -275,9 +275,10 @@ ValidateAndMoveFiles(
   ASSERT(FileList != NULL);
   ASSERT(DestDir  != NULL);
 
-  DestPath = NULL;
-  Cwd      = ShellGetCurrentDir(NULL);
-  Response = *Resp;
+  DestPath         = NULL;
+  Cwd              = ShellGetCurrentDir(NULL);
+  Response         = *Resp;
+  CleanFilePathStr = NULL;
 
   Status = ShellLevel2StripQuotes (DestDir, &CleanFilePathStr);
   if (EFI_ERROR (Status)) {
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index dc36db0349..5e03400aeb 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -1502,6 +1502,8 @@ ShellOpenFileMetaArg (
   ASSERT(Arg      != NULL);
   ASSERT(ListHead != NULL);
 
+  CleanFilePathStr = NULL;
+
   Status = InternalShellStripQuotes (Arg, &CleanFilePathStr);
   if (EFI_ERROR (Status)) {
     return Status;