X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FCCode%2FSource%2FCommon%2FFvLib.c;h=f526a30e1a6f0f2eda5b90a59d681758eb12b335;hp=e8d62791f31251fe831b3a62877eb8209ca99efd;hb=cee3584d1ef1cc37724b198b3044d52e0e094c66;hpb=a9a812a0ed4ab3d83941fdc6da281aebdb9bb296

diff --git a/Tools/CCode/Source/Common/FvLib.c b/Tools/CCode/Source/Common/FvLib.c
index e8d62791f3..f526a30e1a 100644
--- a/Tools/CCode/Source/Common/FvLib.c
+++ b/Tools/CCode/Source/Common/FvLib.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
+Copyright (c) 2004 - 2006, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -180,7 +180,7 @@ Returns:
       //
       // Verify file is in this FV.
       //
-      if ((UINTN) CurrentFile >= (UINTN) mFvHeader + mFvLength - sizeof (EFI_FFS_FILE_HEADER)) {
+      if ((UINTN) CurrentFile + GetLength (CurrentFile->Size) > (UINTN) mFvHeader + mFvLength) {
         *NextFile = NULL;
         return EFI_SUCCESS;
       }
@@ -192,9 +192,9 @@ Returns:
   //
   // Verify current file is in range
   //
-  if (((UINTN) CurrentFile < (UINTN) mFvHeader + sizeof (EFI_FIRMWARE_VOLUME_HEADER)) ||
-      ((UINTN) CurrentFile >= (UINTN) mFvHeader + mFvLength - sizeof (EFI_FIRMWARE_VOLUME_HEADER))
-      ) {
+  if (((UINTN) CurrentFile < (UINTN) mFvHeader + mFvHeader->HeaderLength) ||
+      ((UINTN) CurrentFile + GetLength (CurrentFile->Size) > (UINTN) mFvHeader + mFvLength)
+     ) {
     return EFI_INVALID_PARAMETER;
   }
   //
@@ -205,7 +205,9 @@ Returns:
   //
   // Verify file is in this FV.
   //
-  if ((UINTN) *NextFile >= (UINTN) mFvHeader + mFvLength - sizeof (EFI_FFS_FILE_HEADER)) {
+  if (((UINTN) *NextFile + sizeof (EFI_FFS_FILE_HEADER) >= (UINTN) mFvHeader + mFvLength) ||
+      ((UINTN) *NextFile + GetLength ((*NextFile)->Size) > (UINTN) mFvHeader + mFvLength)
+     ) {
     *NextFile = NULL;
     return EFI_SUCCESS;
   }