From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C41972007D1EB for ; Thu, 14 Sep 2017 21:54:59 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Sep 2017 21:57:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,396,1500966000"; d="scan'208";a="152114429" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 14 Sep 2017 21:57:58 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Paulo Alcantara , Ruiyu Ni , Star Zeng , Eric Dong Date: Fri, 15 Sep 2017 12:57:48 +0800 Message-Id: <20170915045753.588-3-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20170915045753.588-1-hao.a.wu@intel.com> References: <20170915045753.588-1-hao.a.wu@intel.com> Subject: [PATCH 2/7] MdeModulePkg/UdfDxe: Fix operands of different size in bitwise OP X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Sep 2017 04:54:59 -0000 Cc: Paulo Alcantara Cc: Ruiyu Ni Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu --- MdeModulePkg/Universal/Disk/UdfDxe/File.c | 2 +- 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 82db75475b..4c2cf67fa3 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 02a73a9eb9..f63e7e660b 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++; -- 2.12.0.windows.1