On 10/8/2018 9:23 PM, [email protected] wrote:
-----Original Message-----
diff --git a/MdePkg/Library/BaseLib/FilePaths.c
b/MdePkg/Library/BaseLib/FilePaths.c
index d6f3758ecb..5d3de01894 100644
--- a/MdePkg/Library/BaseLib/FilePaths.c
+++ b/MdePkg/Library/BaseLib/FilePaths.c
@@ -2,6 +2,7 @@
Defines file-path manipulation functions.
Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2018, Dell Technologies. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -103,7 +104,9 @@ PathCleanUpDirectories(
) {
*(TempString + 1) = CHAR_NULL;
PathRemoveLastItem(Path);
- CopyMem (Path + StrLen (Path), TempString + 3, StrSize (TempString + 3));
+ if (*(TempString + 3)) {
+ CopyMem (Path + StrLen (Path), TempString + 4, StrSize (TempString + 4));
+ }
I just setup a debugging environment to trace the code. Finally I
understand the issue.
I agree to change "TempString + 3" to "TempString + 4". This can
eliminate double slash so in next same loop, the pattern "\\..\\" or
"\\..\0" can be detected and "last item" can be correctly removed by
PathRemoveLastItem().
Can you change
"if (*(TempString + 3))"
to
"if (*(TempString + 3) != CHAR_NULL)"?
With the above change, Reviewed-by: Ruiyu Ni <[email protected]>
If you agree, I can modify your patch and push it for you.
}
//
Jim,
Are you fixing a corner case bug introduced by following commit:
SHA-1: bb99e3282c9e69fbd6365d117c58d15589e34c5d
* MdePkg/BaseLib: Fix PathCleanUpDirectories to correctly handle "\.\"
The old code incorrectly cleans path like "fs0:\abc\.\.." to
"fs0:\abc", instead of "fs0:\"
The patch fixes this bug.
Honestly, because of the scope of bb99e328, I cannot say for sure, but
my inclination is to answer "No."
The current fix is strictly related to handling paths that include two
or more references to the previous directory, whether or not one of them
abuts a reference to the current directory (as in the bb99e328 fix).
Regards,
Jim
--
Thanks,
Ray
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
