* [PATCH EDK2 v2 0/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue
@ 2022-12-16 9:50 wenyi,xie
2022-12-16 9:50 ` [PATCH EDK2 v2 1/1] " wenyi,xie
0 siblings, 1 reply; 3+ messages in thread
From: wenyi,xie @ 2022-12-16 9:50 UTC (permalink / raw)
To: devel, jian.j.wang, gaoliming, zhichao.gao, ray.ni
Cc: songdongkuang, xiewenyi2
Main Changes since v1 :
1.fix format issue found by Uncrustify
Wenyi Xie (1):
MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue
MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 6 ++++++
1 file changed, 6 insertions(+)
--
2.20.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH EDK2 v2 1/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue
2022-12-16 9:50 [PATCH EDK2 v2 0/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue wenyi,xie
@ 2022-12-16 9:50 ` wenyi,xie
0 siblings, 0 replies; 3+ messages in thread
From: wenyi,xie @ 2022-12-16 9:50 UTC (permalink / raw)
To: devel, jian.j.wang, gaoliming, zhichao.gao, ray.ni
Cc: songdongkuang, xiewenyi2
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.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
---
MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c
index c5e885d7a6d5..1cdd857f48f8 100644
--- a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c
+++ b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c
@@ -236,6 +236,12 @@ TranslateBmpToGopBlt (
return RETURN_UNSUPPORTED;
}
+ if ((BmpHeader->ImageOffset == sizeof (BMP_IMAGE_HEADER)) &&
+ ((BmpHeader->BitPerPixel & 0x0D) != 0))
+ {
+ return RETURN_UNSUPPORTED;
+ }
+
if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) {
switch (BmpHeader->BitPerPixel) {
case 1:
--
2.20.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH EDK2 v2 0/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue
@ 2022-08-18 2:26 wenyi,xie
2022-08-18 2:26 ` [PATCH EDK2 v2 1/1] " wenyi,xie
0 siblings, 1 reply; 3+ messages in thread
From: wenyi,xie @ 2022-08-18 2:26 UTC (permalink / raw)
To: devel, jian.j.wang, gaoliming, zhichao.gao, ray.ni
Cc: songdongkuang, xiewenyi2
Main Changes since v1 :
1.fix format issue found by Uncrustify
Wenyi Xie (1):
MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue
MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 6 ++++++
1 file changed, 6 insertions(+)
--
2.20.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH EDK2 v2 1/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue
2022-08-18 2:26 [PATCH EDK2 v2 0/1] " wenyi,xie
@ 2022-08-18 2:26 ` wenyi,xie
0 siblings, 0 replies; 3+ messages in thread
From: wenyi,xie @ 2022-08-18 2:26 UTC (permalink / raw)
To: devel, jian.j.wang, gaoliming, zhichao.gao, ray.ni
Cc: songdongkuang, xiewenyi2
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.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
---
MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c
index c5e885d7a6d5..1cdd857f48f8 100644
--- a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c
+++ b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c
@@ -236,6 +236,12 @@ TranslateBmpToGopBlt (
return RETURN_UNSUPPORTED;
}
+ if ((BmpHeader->ImageOffset == sizeof (BMP_IMAGE_HEADER)) &&
+ ((BmpHeader->BitPerPixel & 0x0D) != 0))
+ {
+ return RETURN_UNSUPPORTED;
+ }
+
if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) {
switch (BmpHeader->BitPerPixel) {
case 1:
--
2.20.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-16 9:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-16 9:50 [PATCH EDK2 v2 0/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue wenyi,xie
2022-12-16 9:50 ` [PATCH EDK2 v2 1/1] " wenyi,xie
-- strict thread matches above, loose matches on Subject: below --
2022-08-18 2:26 [PATCH EDK2 v2 0/1] " wenyi,xie
2022-08-18 2:26 ` [PATCH EDK2 v2 1/1] " wenyi,xie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox