tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-25 18:48:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdePkg/BasePeCoffLib2: Fix uninitialized RtContext for RelocateImage()

Browse Source
This commit is contained in:
Marvin Häuser 2023-04-27 17:32:35 +02:00 committed by Mikhail Krichanov
parent d6657d8dd7
commit 2304aa1fd3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
View File

@ -438,6 +438,13 @@ PeCoffRelocateImage (
ASSERT (RuntimeContext != NULL || RuntimeContextSize == 0); ASSERT (RuntimeContext != NULL || RuntimeContextSize == 0);
ASSERT (RuntimeContext == NULL || RuntimeContextSize >= sizeof (PE_COFF_LOADER_RUNTIME_CONTEXT) + Context->RelocDirSize * (sizeof (UINT64) / sizeof (UINT16))); ASSERT (RuntimeContext == NULL || RuntimeContextSize >= sizeof (PE_COFF_LOADER_RUNTIME_CONTEXT) + Context->RelocDirSize * (sizeof (UINT64) / sizeof (UINT16)));
// //
// Initialise the Image runtime context header.
//
if (RuntimeContext != NULL) {
RuntimeContext->RelocDirRva = Context->RelocDirRva;
RuntimeContext->RelocDirSize = Context->RelocDirSize;
}
//
// Verify the Relocation Directory is not empty. // Verify the Relocation Directory is not empty.
// //
if (Context->RelocDirSize == 0) { if (Context->RelocDirSize == 0) {
@ -458,13 +465,6 @@ PeCoffRelocateImage (
if (RuntimeContext == NULL && Adjust == 0) { if (RuntimeContext == NULL && Adjust == 0) {
return RETURN_SUCCESS; return RETURN_SUCCESS;
} }
//
// Initialise the Image runtime context header.
//
if (RuntimeContext != NULL) {
RuntimeContext->RelocDirRva = Context->RelocDirRva;
RuntimeContext->RelocDirSize = Context->RelocDirSize;
}
RelocBlockOffset = Context->RelocDirRva; RelocBlockOffset = Context->RelocDirRva;
TopOfRelocDir = Context->RelocDirRva + Context->RelocDirSize; TopOfRelocDir = Context->RelocDirRva + Context->RelocDirSize;