tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-24 10:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools/CommonLib: Guarantee 8-byte alignment for AllocatePool()

Browse Source
This commit is contained in:
Marvin Häuser 2023-04-01 18:48:10 +02:00
parent c382e9c571
commit f3fedad22d
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
BaseTools/Source/C/Common/CommonLib.c
View File

@ -557,6 +557,33 @@ Returns:
}
static
void *
InternalAlignedAlloc (
size_t Alignment,
size_t Size
)
{
#ifndef _WIN32
return aligned_alloc (Alignment, Size);
#else
return _aligned_malloc (Size, Alignment);
#endif
}
static
void
InternalAlignedFree (
void *Ptr
)
{
#ifndef _WIN32
free (Ptr);
#else
_aligned_free (Ptr);
#endif
}
EFI_STATUS
EFIAPI
PhaseAllocatePages (
@ -572,13 +599,7 @@ PhaseAllocatePages (
ASSERT (Type == AllocateAnyPages);
BufferSize = EFI_PAGES_TO_SIZE (Pages);
#ifndef _WIN32
Buffer = aligned_alloc (EFI_PAGE_SIZE, BufferSize);
#else
Buffer = _aligned_malloc (BufferSize, EFI_PAGE_SIZE);
#endif
Buffer = InternalAlignedAlloc (EFI_PAGE_SIZE, BufferSize);
if (Buffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
@ -598,12 +619,7 @@ PhaseFreePages (
VOID *Buffer;
Buffer = (VOID *)(UINTN)Memory;
#ifndef _WIN32
free (Buffer);
#else
_aligned_free (Buffer);
#endif
InternalAlignedFree (Buffer);
return EFI_SUCCESS;
}
@ -615,7 +631,7 @@ PhaseAllocatePool (
IN UINTN AllocationSize
)
{
return malloc (AllocationSize);
return InternalAlignedAlloc (8, AllocationSize);
}
VOID
@ -625,7 +641,7 @@ PhaseFreePool (
)
{
ASSERT (Buffer != NULL);
free (Buffer);
InternalAlignedFree (Buffer);
}
VOID