diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2017-09-14 10:44:59 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2017-09-19 12:43:53 +0800 |
| commit | fedec0a38ef252ad838fe6d6db3cc4d28c7d42dd (patch) | |
| tree | 7ab2b1f55569cd5d37f3167786746bb0d133b3ab /MdeModulePkg/Universal/Disk | |
| parent | 3fa40d588af9cac947fd2abac652ebb95411786c (diff) | |
| download | edk2-fedec0a38ef252ad838fe6d6db3cc4d28c7d42dd.zip edk2-fedec0a38ef252ad838fe6d6db3cc4d28c7d42dd.tar.gz edk2-fedec0a38ef252ad838fe6d6db3cc4d28c7d42dd.tar.bz2 | |
MdeModulePkg/UdfDxe: Fix operands of different size in bitwise OP
Cc: Paulo Alcantara <pcacjr@zytor.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Paulo Alcantara <pcacjr@zytor.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Diffstat (limited to 'MdeModulePkg/Universal/Disk')
| -rw-r--r-- | MdeModulePkg/Universal/Disk/UdfDxe/File.c | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/File.c b/MdeModulePkg/Universal/Disk/UdfDxe/File.c index 82db754..4c2cf67 100644 --- a/MdeModulePkg/Universal/Disk/UdfDxe/File.c +++ b/MdeModulePkg/Universal/Disk/UdfDxe/File.c @@ -806,7 +806,7 @@ UdfGetInfo ( }
if (Index < 128) {
- *String |= *(UINT8 *)(OstaCompressed + Index);
+ *String |= (CHAR16)(*(UINT8 *)(OstaCompressed + Index));
}
//
diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c index 02a73a9..f63e7e6 100644 --- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c +++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c @@ -1782,7 +1782,7 @@ GetFileNameFromFid ( }
if (Index < Length) {
- *FileName |= OstaCompressed[Index];
+ *FileName |= (CHAR16)(OstaCompressed[Index]);
}
FileName++;
@@ -1918,7 +1918,7 @@ ResolveSymlink ( }
if (Index < Length) {
- *C |= *(UINT8 *)((UINT8 *)PathComp->ComponentIdentifier + Index);
+ *C |= (CHAR16)(*(UINT8 *)((UINT8 *)PathComp->ComponentIdentifier + Index));
}
C++;
|