Merge pull request #536 from CreateAndInject/CheckOverlaps

wtfsck · web-flow · commit 83a0ac6a2d7a · 2024-01-15T23:01:22.000+01:00
Check overlaps
diff --git a/src/DotNet/Writer/NativeModuleWriter.cs b/src/DotNet/Writer/NativeModuleWriter.cs
@@ -354,6 +354,12 @@ void ReuseIfPossible(PESection section, IReuseChunk chunk, RVA origRva, uint ori
 			if (((uint)origRva & (requiredAlignment - 1)) != 0)
 				return;
 
+			var origEnd = origRva + origSize;
+			foreach (var reusedChunk in reusedChunks) {
+				if (origRva < reusedChunk.RVA + reusedChunk.Chunk.GetVirtualSize() && origEnd > reusedChunk.RVA)
+					return;
+			}
+
 			if (section.Remove(chunk) is null)
 				throw new InvalidOperationException();
 			reusedChunks.Add(new ReusedChunkInfo(chunk, origRva));
