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

Temporarily remove the assertions and we may find some error handling way to address potential dereference to NULL pointer. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7173 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2009-01-04 03:38:23 +00:00
parent 109e9a6156
commit 884c8bc047
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MdePkg/Library/BasePeCoffLib/BasePeCoff.c
View File

@ -588,12 +588,10 @@ PeCoffLoaderRelocateImage (
if (NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) { if (NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress); RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
ASSERT(RelocBase != NULL);
RelocBaseEnd = PeCoffLoaderImageAddress ( RelocBaseEnd = PeCoffLoaderImageAddress (
ImageContext, ImageContext,
RelocDir->VirtualAddress + RelocDir->Size - 1 RelocDir->VirtualAddress + RelocDir->Size - 1
); );
ASSERT(RelocBaseEnd !=NULL);
} else { } else {
// //
// Set base and end to bypass processing below. // Set base and end to bypass processing below.
@ -628,7 +626,6 @@ PeCoffLoaderRelocateImage (
RelocEnd = (UINT16 *) ((CHAR8 *) RelocBase + RelocBase->SizeOfBlock); RelocEnd = (UINT16 *) ((CHAR8 *) RelocBase + RelocBase->SizeOfBlock);
if (!(ImageContext->IsTeImage)) { if (!(ImageContext->IsTeImage)) {
FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress); FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
ASSERT(FixupBase != NULL);
} else { } else {
FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress + FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
RelocBase->VirtualAddress + RelocBase->VirtualAddress +