Fix PeLoad function can't handle invalid PeImage to skip correct debug entry.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2253 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index cce9a825205249d52ca0e56c78b5c62187245282..d82107ecde7813e53a01b76d01bbc945a79191ac 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -391,7 +391,7 @@ PeCoffLoaderGetImageInfo (
       }\r
 \r
       if (DebugDirectoryEntryFileOffset != 0) {\r
       }\r
 \r
       if (DebugDirectoryEntryFileOffset != 0) {\r

-        for (Index = 0; Index < DebugDirectoryEntry->Size; Index += Size) {\r
+        for (Index = 0; Index < DebugDirectoryEntry->Size; Index += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)) {\r

           //\r
           // Read next debug directory entry\r
           //\r
           //\r
           // Read next debug directory entry\r
           //\r


@@ -479,7 +479,7 @@ PeCoffLoaderGetImageInfo (
     }\r
 \r
     if (DebugDirectoryEntryFileOffset != 0) {\r
     }\r
 \r
     if (DebugDirectoryEntryFileOffset != 0) {\r

-      for (Index = 0; Index < DebugDirectoryEntry->Size; Index += Size) {\r
+      for (Index = 0; Index < DebugDirectoryEntry->Size; Index += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)) {\r

         //\r
         // Read next debug directory entry\r
         //\r
         //\r
         // Read next debug directory entry\r
         //\r

diff --git a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
index 72df90f389be21ec50ec48dfea3ad45fd645b869..06d4b83af7e6a11036d134baccaab0fc44bc31b3 100644 (file)
--- a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
+++ b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
@@ -346,7 +346,7 @@ Returns:
       }\r
 \r
       if (DebugDirectoryEntryFileOffset != 0) {    \r
       }\r
 \r
       if (DebugDirectoryEntryFileOffset != 0) {    \r

-        for (Index = 0; Index < (DebugDirectoryEntry->Size); Index += Size) {\r
+        for (Index = 0; Index < DebugDirectoryEntry->Size; Index += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)) {\r

           //\r
           // Read next debug directory entry\r
           //\r
           //\r
           // Read next debug directory entry\r
           //\r


@@ -438,7 +438,7 @@ Returns:
     }\r
 \r
     if (DebugDirectoryEntryFileOffset != 0) {\r
     }\r
 \r
     if (DebugDirectoryEntryFileOffset != 0) {\r

-      for (Index = 0; Index < (DebugDirectoryEntry->Size); Index += Size) {\r
+      for (Index = 0; Index < DebugDirectoryEntry->Size; Index += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)) {\r

         //\r
         // Read next debug directory entry\r
         //\r
         //\r
         // Read next debug directory entry\r
         //\r