EmbeddedPkg/PrePiLib: Ensure the FFS files are always 8-byte aligned

[mirror_edk2.git] / EmbeddedPkg / Library / PrePiLib / FwVol.c

diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c b/EmbeddedPkg/Library/PrePiLib/FwVol.c
index f73f1c0da47e00c3af6f6276d758c5834f86d43e..530fc15dca1c3761695cc599ca7493a8a6f26096 100644 (file)
--- a/EmbeddedPkg/Library/PrePiLib/FwVol.c
+++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c
@@ -209,6 +209,9 @@ FindFileEx (
     FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
   }\r
 \r
+  // FFS files begin with a header that is aligned on an 8-byte boundary\r
+  FfsFileHeader = ALIGN_POINTER (FfsFileHeader, 8);\r
+\r
   FileOffset = (UINT32) ((UINT8 *)FfsFileHeader - (UINT8 *)FwVolHeader);\r
   ASSERT (FileOffset <= 0xFFFFFFFF);\r
 \r