summaryrefslogtreecommitdiffstats
path: root/MdeModulePkg/Library/FileExplorerLib
diff options
context:
space:
mode:
authorHao Wu <hao.a.wu@intel.com>2017-01-23 11:56:05 +0800
committerHao Wu <hao.a.wu@intel.com>2017-03-06 14:14:09 +0800
commit809e2bbf41241f35140dd7f294ddf2489836eef9 (patch)
tree84c5c8cf81169f91f4abcf1def20167e8367fcde /MdeModulePkg/Library/FileExplorerLib
parent588bb5ae52edc99aef6fcb68c31ce0882f0e5c3c (diff)
downloadedk2-809e2bbf41241f35140dd7f294ddf2489836eef9.tar.gz
edk2-809e2bbf41241f35140dd7f294ddf2489836eef9.tar.bz2
edk2-809e2bbf41241f35140dd7f294ddf2489836eef9.zip
MdeModulePkg: Refine type cast for pointer subtraction
For pointer subtraction, the result is of type "ptrdiff_t". According to the C11 standard (Committee Draft - April 12, 2011): "When two pointers are subtracted, both shall point to elements of the same array object, or one past the last element of the array object; the result is the difference of the subscripts of the two array elements. The size of the result is implementation-defined, and its type (a signed integer type) is ptrdiff_t defined in the <stddef.h> header. If the result is not representable in an object of that type, the behavior is undefined." In our codes, there are cases that the pointer subtraction is not performed by pointers to elements of the same array object. This might lead to potential issues, since the behavior is undefined according to C11 standard. Also, since the size of type "ptrdiff_t" is implementation-defined. Some static code checkers may warn that the pointer subtraction might underflow first and then being cast to a bigger size. For example: UINT8 *Ptr1, *Ptr2; UINTN PtrDiff; ... PtrDiff = (UINTN) (Ptr1 - Ptr2); The commit will refine the pointer subtraction expressions by casting each pointer to UINTN first and then perform the subtraction: PtrDiff = (UINTN) Ptr1 - (UINTN) Ptr2; Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu <hao.a.wu@intel.com> Acked-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Feng Tian <feng.tian@intel.com>
Diffstat (limited to 'MdeModulePkg/Library/FileExplorerLib')
-rw-r--r--MdeModulePkg/Library/FileExplorerLib/FileExplorer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
index 5eedad7203..9182751ad7 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
@@ -728,7 +728,7 @@ LibAppendFileName (
// that overlap.
//
StrCpyS (TmpStr, MaxLen, Ptr + 3);
- StrCpyS (LastSlash, MaxLen - (UINTN) (LastSlash - Str), TmpStr);
+ StrCpyS (LastSlash, MaxLen - ((UINTN) LastSlash - (UINTN) Str) / sizeof (CHAR16), TmpStr);
Ptr = LastSlash;
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
//
@@ -740,7 +740,7 @@ LibAppendFileName (
// that overlap.
//
StrCpyS (TmpStr, MaxLen, Ptr + 2);
- StrCpyS (Ptr, MaxLen - (UINTN) (Ptr - Str), TmpStr);
+ StrCpyS (Ptr, MaxLen - ((UINTN) Ptr - (UINTN) Str) / sizeof (CHAR16), TmpStr);
Ptr = LastSlash;
} else if (*Ptr == '\\') {
LastSlash = Ptr;