Some more bug fixes around relocations.

Workshell · Jun 7, 2016 · 006dc36 · 006dc36
1 parent 9bf893c
commit 006dc36
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Src/Workshell.PE/Content/Relocation/RelocationTableContent.cs b/Src/Workshell.PE/Content/Relocation/RelocationTableContent.cs
@@ -43,10 +43,9 @@ private void LoadRelocations(LocationCalculator calc, Stream stream, ulong image
             {
                 IMAGE_BASE_RELOCATION base_reloc = Utils.Read<IMAGE_BASE_RELOCATION>(stream);
 
-                block_offset += sizeof(ulong);
                 block_size += sizeof(ulong);
 
-                long count = (base_reloc.SizeOfBlock - 8) / 2;
+                long count = (base_reloc.SizeOfBlock - sizeof(ulong)) / sizeof(ushort);
                 List<ushort> relocs = new List<ushort>();
 
                 for(long i = 0; i < count; i++)
@@ -55,7 +54,6 @@ private void LoadRelocations(LocationCalculator calc, Stream stream, ulong image
 
                     relocs.Add(reloc);
 
-                    block_offset += sizeof(ushort);
                     block_size += sizeof(ushort);
                 }
 
@@ -65,6 +63,9 @@ private void LoadRelocations(LocationCalculator calc, Stream stream, ulong image
 
                 if (block_size >= DataDirectory.Size)
                     break;
+
+                block_offset += sizeof(ulong);
+                block_offset += sizeof(ushort) * (uint)count;
             }
 
             relocations = new RelocationBlocks(this,location,block_relocs,imageBase);