Fix two bugs in FvLib functions.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1772 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/Common/FvLib.c b/Source/C/Common/FvLib.c
index dc50e87..a6f17e1 100644 (file)
--- a/Source/C/Common/FvLib.c
+++ b/Source/C/Common/FvLib.c
@@ -110,6 +110,7 @@ Returns:
   }\r
 \r
   *FvHeader = mFvHeader;\r
+  *FvLength = mFvLength;\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -200,7 +201,7 @@ Returns:
   //\r
   // Get next file, compensate for 8 byte alignment if necessary.\r
   //\r
-  *NextFile = (EFI_FFS_FILE_HEADER *) (((UINTN) CurrentFile + GetLength (CurrentFile->Size) + 0x07) & (-1 << 3));\r
+  *NextFile = (EFI_FFS_FILE_HEADER *) ((((UINTN) CurrentFile - (UINTN) mFvHeader + GetLength (CurrentFile->Size) + 0x07) & (-1 << 3)) + (UINT8 *) mFvHeader);\r
 \r
   //\r
   // Verify file is in this FV.\r