Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg: HiiDatabase: Refine the code to make it more safely. 

Refine the code to avoid potential buffer overflow or use NULL pointer.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19735 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2016-01-25 03:38:19 +00:00 committed by ydong10
parent 95055567a6
commit 2a244a5d9f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
View File

@ -2,7 +2,7 @@
Implementation for EFI_HII_IMAGE_PROTOCOL. Implementation for EFI_HII_IMAGE_PROTOCOL.
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -266,7 +266,7 @@ Output1bitPixel (
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BitMapPtr; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BitMapPtr;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL PaletteValue[2]; EFI_GRAPHICS_OUTPUT_BLT_PIXEL PaletteValue[2];
EFI_HII_IMAGE_PALETTE_INFO *Palette; EFI_HII_IMAGE_PALETTE_INFO *Palette;
UINT16 PaletteSize; UINTN PaletteSize;
UINT8 Byte; UINT8 Byte;
ASSERT (Image != NULL && Data != NULL && PaletteInfo != NULL); ASSERT (Image != NULL && Data != NULL && PaletteInfo != NULL);
@ -276,10 +276,14 @@ Output1bitPixel (
// //
// First entry corresponds to color 0 and second entry corresponds to color 1. // First entry corresponds to color 0 and second entry corresponds to color 1.
// //
PaletteSize = 0;
CopyMem (&PaletteSize, PaletteInfo, sizeof (UINT16)); CopyMem (&PaletteSize, PaletteInfo, sizeof (UINT16));
PaletteSize += sizeof (UINT16); PaletteSize += sizeof (UINT16);
Palette = AllocateZeroPool (PaletteSize); Palette = AllocateZeroPool (PaletteSize);
ASSERT (Palette != NULL); ASSERT (Palette != NULL);
if (Palette == NULL) {
return;
}
CopyMem (Palette, PaletteInfo, PaletteSize); CopyMem (Palette, PaletteInfo, PaletteSize);
ZeroMem (PaletteValue, sizeof (PaletteValue)); ZeroMem (PaletteValue, sizeof (PaletteValue));
@ -350,7 +354,7 @@ Output4bitPixel (
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BitMapPtr; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BitMapPtr;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL PaletteValue[16]; EFI_GRAPHICS_OUTPUT_BLT_PIXEL PaletteValue[16];
EFI_HII_IMAGE_PALETTE_INFO *Palette; EFI_HII_IMAGE_PALETTE_INFO *Palette;
UINT16 PaletteSize; UINTN PaletteSize;
UINT16 PaletteNum; UINT16 PaletteNum;
UINT8 Byte; UINT8 Byte;
@ -361,10 +365,14 @@ Output4bitPixel (
// //
// The bitmap should allocate each color index starting from 0. // The bitmap should allocate each color index starting from 0.
// //
PaletteSize = 0;
CopyMem (&PaletteSize, PaletteInfo, sizeof (UINT16)); CopyMem (&PaletteSize, PaletteInfo, sizeof (UINT16));
PaletteSize += sizeof (UINT16); PaletteSize += sizeof (UINT16);
Palette = AllocateZeroPool (PaletteSize); Palette = AllocateZeroPool (PaletteSize);
ASSERT (Palette != NULL); ASSERT (Palette != NULL);
if (Palette == NULL) {
return;
}
CopyMem (Palette, PaletteInfo, PaletteSize); CopyMem (Palette, PaletteInfo, PaletteSize);
PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL)); PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));
@ -424,7 +432,7 @@ Output8bitPixel (
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BitMapPtr; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BitMapPtr;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL PaletteValue[256]; EFI_GRAPHICS_OUTPUT_BLT_PIXEL PaletteValue[256];
EFI_HII_IMAGE_PALETTE_INFO *Palette; EFI_HII_IMAGE_PALETTE_INFO *Palette;
UINT16 PaletteSize; UINTN PaletteSize;
UINT16 PaletteNum; UINT16 PaletteNum;
UINT8 Byte; UINT8 Byte;
@ -435,10 +443,14 @@ Output8bitPixel (
// //
// The bitmap should allocate each color index starting from 0. // The bitmap should allocate each color index starting from 0.
// //
PaletteSize = 0;
CopyMem (&PaletteSize, PaletteInfo, sizeof (UINT16)); CopyMem (&PaletteSize, PaletteInfo, sizeof (UINT16));
PaletteSize += sizeof (UINT16); PaletteSize += sizeof (UINT16);
Palette = AllocateZeroPool (PaletteSize); Palette = AllocateZeroPool (PaletteSize);
ASSERT (Palette != NULL); ASSERT (Palette != NULL);
if (Palette == NULL) {
return;
}
CopyMem (Palette, PaletteInfo, PaletteSize); CopyMem (Palette, PaletteInfo, PaletteSize);
PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL)); PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));
ZeroMem (PaletteValue, sizeof (PaletteValue)); ZeroMem (PaletteValue, sizeof (PaletteValue));