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>

diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/File.c b/MdeModulePkg/Universal/Disk/UdfDxe/File.c
index 82db75475b6d7120eb69a10c590687363991cb4b..4c2cf67fa31cbf0bd16fc37f4d28c33bd33b300d 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UdfDxe/File.c
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/File.c
@@ -806,7 +806,7 @@ UdfGetInfo (
       }\r
 \r
       if (Index < 128) {\r
-        *String |= *(UINT8 *)(OstaCompressed + Index);\r
+        *String |= (CHAR16)(*(UINT8 *)(OstaCompressed + Index));\r
       }\r
 \r
       //\r

diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
index 02a73a9eb9e4d86b1f926d42b06fcad822e6bcc9..f63e7e660b3adc6da5cbebf7d18a370813f3c759 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
@@ -1782,7 +1782,7 @@ GetFileNameFromFid (
     }\r
 \r
     if (Index < Length) {\r
-      *FileName |= OstaCompressed[Index];\r
+      *FileName |= (CHAR16)(OstaCompressed[Index]);\r
     }\r
 \r
     FileName++;\r
@@ -1918,7 +1918,7 @@ ResolveSymlink (
         }\r
 \r
         if (Index < Length) {\r
-          *C |= *(UINT8 *)((UINT8 *)PathComp->ComponentIdentifier + Index);\r
+          *C |= (CHAR16)(*(UINT8 *)((UINT8 *)PathComp->ComponentIdentifier + Index));\r
         }\r
 \r
         C++;\r