Merge pull request #34 from dakotahawkins/fix_dumpDebugLineInfoCOFF

Fix PEImage::dumpDebugLineInfoCOFF()

1 files changed, 34 insertions, 17 deletions

diff --git a/src/PEImage.cpp b/src/PEImage.cpp
index e8e405a..644f36e 100644
--- a/src/PEImage.cpp
+++ b/src/PEImage.cpp
@@ -562,15 +562,19 @@ int PEImage::getRelocationInSegment(int segment, unsigned int offset) const
 }

 

 ///////////////////////////////////////////////////////////////////////

-struct LineInfoData

+struct LineInfoDataHeader

 {

-    int funcoff;

-    int funcidx;

-    int funcsiz;

-    int srcfileoff;

-    int npairs;

+    int relocoff;

+    short segment;

+    short flags;

     int size;

 };

+struct LineInfoData

+{

+    int nameIndex;

+    int numLines;

+    int lineInfoSize;

+};

 

 struct LineInfoPair

 {

@@ -590,6 +594,8 @@ int PEImage::dumpDebugLineInfoCOFF()
             if (!base || *base != 4)

                 continue;

             DWORD* end = base + sec[s].SizeOfRawData / 4;

+            int lineInfoTotalSize = 0;

+            int lineInfoAccumulatedSize = 0;

             for (DWORD* p = base + 1; p < end; p += (p[1] + 3) / 4 + 2)

             {

                 if (!f4section && p[0] == 0xf4)

@@ -599,20 +605,31 @@ int PEImage::dumpDebugLineInfoCOFF()
                 if (p[0] != 0xf2)

                     continue;

 

-                LineInfoData* info = (LineInfoData*) (p + 2);

-                if (p[1] != info->size + 12)

-                    continue;

+                lineInfoTotalSize = p[1];

+                lineInfoAccumulatedSize = sizeof(LineInfoDataHeader);

 

-                int* f3off = f4section ? (int*)(f4section + info->srcfileoff) : 0;

-                const char* fname = f3off ? f3section + *f3off : "unknown";

-                int section = getRelocationInSegment(s, (char*)info - (char*)base);

+                LineInfoDataHeader* pLineInfoDataHeader = (LineInfoDataHeader*) (p + 2);

+                int section = getRelocationInSegment(s, (char*)pLineInfoDataHeader - (char*)base);

                 const char* secname = findSectionSymbolName(section);

                 printf("Sym: %s\n", secname ? secname : "<none>");

-                printf("File: %s\n", fname);

-                LineInfoPair* pairs = (LineInfoPair*)(info + 1);

-                for (int i = 0; i < info->npairs; i++)

-                    printf("\tOff 0x%x: Line %d\n", pairs[i].offset, pairs[i].line & 0x7fffffff);

-             }

+

+                DWORD* pLID = p + 2 + (sizeof(LineInfoDataHeader) / 4);

+                while (lineInfoAccumulatedSize < lineInfoTotalSize && pLID < end)

+                {

+                    LineInfoData* pLineInfoData = (LineInfoData*) (pLID);

+

+                    int* f3off = f4section ? (int*)(f4section + pLineInfoData->nameIndex) : 0;

+                    const char* fname = f3off ? f3section + *f3off : "unknown";

+                    printf("File: %s\n", fname);

+

+                    LineInfoPair* lineInfoPairs = (LineInfoPair*) (pLineInfoData + 1);

+                    for (int i = 0; i < pLineInfoData->numLines; ++i)

+                        printf("\tOff 0x%x: Line %d\n", lineInfoPairs[i].offset, lineInfoPairs[i].line & 0x7fffffff);

+

+                    pLID += (pLineInfoData->lineInfoSize / 4);

+                    lineInfoAccumulatedSize += pLineInfoData->lineInfoSize;

+                }

+            }

         }

     }

     return 0;