From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web09.7341.1660279974397083781 for ; Thu, 11 Aug 2022 21:52:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=PA8UsA4S; spf=pass (domain: byosoft.com.cn, ip: 101.227.64.242, mailfrom: gaoliming@byosoft.com.cn) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id DB040CD1F65A for ; Fri, 12 Aug 2022 12:52:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1660279971; bh=4MNh6vpINiSDIKXQogKLilOFcdgANnDUK1rLCJllukQ=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=PA8UsA4SvU5/7TqGS5IUHkmgFPQpHbhA33pgwMg6UMAeXUINMqlJQ084O/r5msf8y qXJsVCiHB2Sh9f0xAEPoor7O7NTLmF/rYvVY5M1RR6T2PMTpmp8lOBHXwiQkTyAvmv xbKZ2unOcE558qgmm47nDjNPE5t0tXNQLWeJZgMI= Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id D6D6DCD1F66A for ; Fri, 12 Aug 2022 12:52:50 +0800 (CST) X-Virus-Scanned: by SpamTitan at intel-email.com Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id A19A3CD1F651 for ; Fri, 12 Aug 2022 12:52:50 +0800 (CST) Authentication-Results: walk.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id 2D217CD1F65A for ; Fri, 12 Aug 2022 12:52:47 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Fri, 12 Aug 2022 12:52:44 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Wenyi Xie'" , , , , Cc: References: <20220811083146.3954530-1-xiewenyi2@huawei.com> <20220811083146.3954530-2-xiewenyi2@huawei.com> In-Reply-To: <20220811083146.3954530-2-xiewenyi2@huawei.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0ggRURLMiB2MSAxLzFdIE1kZU1vZHVsZVBrZy9CYXNlQm1wU3VwcG9ydExpYjogRml4IENvbG9yTWFwIGlzc3Vl?= Date: Fri, 12 Aug 2022 12:52:46 +0800 Message-ID: <018201d8ae07$5da10f30$18e32d90$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQH5QvExGp9+YsYd6mLRFTnC4ZYHMgFCeWkqrV902qA= Sender: "gaoliming" Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Agree this fix to add the check for this case. Reviewed-by: Liming Gao Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Wenyi Xie > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA8=D4=C211=C8=D5 16:32 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io; jian.j.wang@intel.com; > gaoliming@byosoft.com.cn; zhichao.gao@intel.com; ray.ni@intel.com > =B3=AD=CB=CD: songdongkuang@huawei.com; xiewenyi2@huawei.com > =D6=F7=CC=E2: [PATCH EDK2 v1 1/1] MdeModulePkg/BaseBmpSupportLib: Fix > ColorMap issue >=20 > When BitPerPixel is 1,4,8, there should be a color map in bmp file. = But if > the format of bmp file is error, it maybe has no color map when BitPerPixel > is 1,4,8. The condition checking now can not catch this issue. >=20 > Cc: Jian J Wang > Cc: Liming Gao > Cc: Zhichao Gao > Cc: Ray Ni > Signed-off-by: Wenyi Xie > --- > MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 5 +++++ > 1 file changed, 5 insertions(+) >=20 > diff --git a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c > b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c > index c5e885d7a6d5..bea89d530de6 100644 > --- a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c > +++ b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c > @@ -236,6 +236,11 @@ TranslateBmpToGopBlt ( > return RETURN_UNSUPPORTED; > } >=20 > + if ((BmpHeader->ImageOffset =3D=3D sizeof (BMP_IMAGE_HEADER)) && > + ((BmpHeader->BitPerPixel & 0x0D) !=3D 0)) { > + return RETURN_UNSUPPORTED; > + } > + > if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) { > switch (BmpHeader->BitPerPixel) { > case 1: > -- > 2.20.1.windows.1