UefiPayloadPkg: Fix Coverity report defect

https://bugzilla.tianocore.org/show_bug.cgi?id=4018
Coverity report FORWARD_NULL and OVERFLOW_BEFORE_WIDEN potential defect
in UefiPayloadPkg.

Signed-off-by: Gregx Yeh <gregx.yeh@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: James Lu <james.lu@intel.com>
This commit is contained in:
James Lu 2022-08-23 11:13:55 +08:00 committed by mergify[bot]
parent f2bf043aaa
commit dfdba857a6
3 changed files with 5 additions and 5 deletions

View File

@ -232,11 +232,11 @@ PciHostBridgeFreeRootBridges (
UINTN Count UINTN Count
) )
{ {
if ((Bridges == NULL) && (Count == 0)) { if ((Bridges == NULL) || (Count == 0)) {
return; return;
} }
ASSERT (Bridges != NULL && Count > 0); ASSERT (Bridges != NULL || Count > 0);
do { do {
--Count; --Count;

View File

@ -149,7 +149,7 @@ CalculateElfFileSize (
FileSize2 = Elf32Hdr->e_shoff + Elf32Hdr->e_shentsize * Elf32Hdr->e_shnum; FileSize2 = Elf32Hdr->e_shoff + Elf32Hdr->e_shentsize * Elf32Hdr->e_shnum;
} else if (ElfCt->EiClass == ELFCLASS64) { } else if (ElfCt->EiClass == ELFCLASS64) {
Elf64Hdr = (Elf64_Ehdr *)ElfCt->FileBase; Elf64Hdr = (Elf64_Ehdr *)ElfCt->FileBase;
FileSize2 = (UINTN)(Elf64Hdr->e_shoff + Elf64Hdr->e_shentsize * Elf64Hdr->e_shnum); FileSize2 = ((UINTN)Elf64Hdr->e_shoff + (UINTN)(Elf64Hdr->e_shentsize * Elf64Hdr->e_shnum));
} }
*FileSize = MAX (FileSize1, FileSize2); *FileSize = MAX (FileSize1, FileSize2);

View File

@ -778,9 +778,9 @@ CreateIdentityMappingPageTables (
// Pre-allocate big pages to avoid later allocations. // Pre-allocate big pages to avoid later allocations.
// //
if (!Page1GSupport) { if (!Page1GSupport) {
TotalPagesNum = ((NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1; TotalPagesNum = (UINTN)((NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;
} else { } else {
TotalPagesNum = (NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1; TotalPagesNum = (UINTN)(NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;
} }
// //