MdePkg-BaseLib: Fix PathCleanUpDirectories() error involving "\..\.."

MdePkg-BaseLib: Fix PathCleanUpDirectories() error involving "\..\.."

The loop that removes "xxxx\..\" errs when multiple "\.." sequences are
in the path.  Before this change the code would modify a path like
"FS0:\efi\tools\..\.." to "FS0:\efi\\.." and then to "FS0:\efi\", but
the correct path is "FS0:\".

You can test the effect of this change in the shell by setting the
current directory to something like FS0:\efi\boot and then executing
the command "ls ..\..".  Before the change you will see the files in
the FS0:\efi directory; after the change, you will see the files in
the root directory of FS0:.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jim Dailey <jim_dailey@dell.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/MdePkg/Library/BaseLib/FilePaths.c b/MdePkg/Library/BaseLib/FilePaths.c
index d6f3758ecb10275ad12d33f39c0859ac74fa2144..ce6b3720d5d4e513ae4c33c56473b8a81da2b0fc 100644 (file)
--- a/MdePkg/Library/BaseLib/FilePaths.c
+++ b/MdePkg/Library/BaseLib/FilePaths.c
@@ -2,6 +2,7 @@
   Defines file-path manipulation functions.\r
 \r
   Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2018, Dell Technologies. 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
@@ -103,7 +104,9 @@ PathCleanUpDirectories(
         ) {\r
     *(TempString + 1) = CHAR_NULL;\r
     PathRemoveLastItem(Path);\r
-    CopyMem (Path + StrLen (Path), TempString + 3, StrSize (TempString + 3));\r
+    if (*(TempString + 3) != CHAR_NULL) {\r
+      CopyMem (Path + StrLen (Path), TempString + 4, StrSize (TempString + 4));\r
+    }\r
   }\r
 \r
   //\r