Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-12-23 16:17:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

system libraries shouldnt dereference null pointer in RELEASE compilation

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2019-09-13 13:27:37 +03:00
parent a5e5da3717
commit 0a8c146676
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
MdePkg/Library/UefiLib/UefiLibPrint.c
View File

@ -59,17 +59,23 @@ InternalPrint (
UINTN BufferSize;
ASSERT (Format != NULL);
if (!Format || !Console || !Console->OutputString) {
return 0;
}
ASSERT (((UINTN) Format & BIT0) == 0);
ASSERT (Console != NULL);
// ASSERT (Console != NULL);
BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16);
Buffer = (CHAR16 *) AllocatePool(BufferSize);
ASSERT (Buffer != NULL);
if (!Buffer) {
return 0;
}
Return = UnicodeVSPrint (Buffer, BufferSize, Format, Marker);
if (Console != NULL && Return > 0) {
if (/*Console != NULL && */ Return > 0) {
//
// To be extra safe make sure Console has been initialized
//
@ -196,15 +202,21 @@ AsciiInternalPrint (
ASSERT (Format != NULL);
ASSERT (Console != NULL);
if (!Format || !Console || !Console->OutputString) {
return 0;
}
BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16);
Buffer = (CHAR16 *) AllocatePool(BufferSize);
ASSERT (Buffer != NULL);
if (!Buffer) {
return 0;
}
Return = UnicodeVSPrintAsciiFormat (Buffer, BufferSize, Format, Marker);
if (Console != NULL) {
if (Return > 0) {
//
// To be extra safe make sure Console has been initialized
//
@ -367,6 +379,9 @@ InternalPrintGraphic (
ConsoleHandle = gST->ConsoleOutHandle;
ASSERT( ConsoleHandle != NULL);
if (!ConsoleHandle) {
return 0;
}
Status = gBS->HandleProtocol (
ConsoleHandle,
@ -419,6 +434,9 @@ InternalPrintGraphic (
Blt = (EFI_IMAGE_OUTPUT *) AllocateZeroPool (sizeof (EFI_IMAGE_OUTPUT));
ASSERT (Blt != NULL);
if (!Blt) {
return 0;
}
Blt->Width = (UINT16) (HorizontalResolution);
Blt->Height = (UINT16) (VerticalResolution);
@ -477,6 +495,9 @@ InternalPrintGraphic (
Blt->Image.Bitmap = AllocateZeroPool ((UINT32) Blt->Width * Blt->Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
ASSERT (Blt->Image.Bitmap != NULL);
if (!Blt->Image.Bitmap) {
return 0;
}
//
// StringToImage only support blt'ing image to device using GOP protocol. If GOP is not supported in this platform,
@ -499,6 +520,9 @@ InternalPrintGraphic (
if (!EFI_ERROR (Status)) {
ASSERT (RowInfoArray != NULL);
if (!RowInfoArray) {
goto Error;
}
//
// Explicit Line break characters are ignored, so the updated parameter RowInfoArraySize by StringToImage will
// always be 1 or 0 (if there is no valid Unicode Char can be printed). ASSERT here to make sure.
@ -613,14 +637,21 @@ PrintXY (
UINTN ReturnNum;
ASSERT (Format != NULL);
if (!Format) {
return 0;
}
ASSERT (((UINTN) Format & BIT0) == 0);
VA_START (Marker, Format);
BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16);
Buffer = (CHAR16 *) AllocatePool (BufferSize);
ASSERT (Buffer != NULL);
if (!Buffer) {
return 0;
}
PrintNum = UnicodeVSPrint (Buffer, BufferSize, Format, Marker);
@ -692,6 +723,9 @@ AsciiPrintXY (
UINTN ReturnNum;
ASSERT (Format != NULL);
if (!Format) {
return 0;
}
VA_START (Marker, Format);
@ -699,6 +733,9 @@ AsciiPrintXY (
Buffer = (CHAR16 *) AllocatePool (BufferSize);
ASSERT (Buffer != NULL);
if (!Buffer) {
return 0;
}
PrintNum = UnicodeSPrintAsciiFormat (Buffer, BufferSize, Format, Marker);

12
MdePkg/Library/UefiLib/UefiNotTiano.c
View File

@ -78,6 +78,9 @@ EfiCreateEventLegacyBootEx (
EFI_EVENT_NOTIFY WorkerNotifyFunction;
ASSERT (LegacyBootEvent != NULL);
if (!LegacyBootEvent) {
return EFI_INVALID_PARAMETER;
}
if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) {
DEBUG ((EFI_D_ERROR, "EFI1.1 can't support LegacyBootEvent!"));
@ -173,6 +176,9 @@ EfiCreateEventReadyToBootEx (
EFI_EVENT_NOTIFY WorkerNotifyFunction;
ASSERT (ReadyToBootEvent != NULL);
if (!ReadyToBootEvent) {
return EFI_INVALID_PARAMETER;
}
if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) {
DEBUG ((EFI_D_ERROR, "EFI1.1 can't support ReadyToBootEvent!"));
@ -282,6 +288,9 @@ EfiGetNameGuidFromFwVolDevicePathNode (
)
{
ASSERT (FvDevicePathNode != NULL);
if (!FvDevicePathNode) {
return NULL;
}
if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH &&
DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_PIWG_FW_FILE_DP) {
@ -317,6 +326,9 @@ EfiInitializeFwVolDevicepathNode (
{
ASSERT (FvDevicePathNode != NULL);
ASSERT (NameGuid != NULL);
if (!FvDevicePathNode || !NameGuid) {
return;
}
//
// Use the new Device path that does not conflict with the UEFI