Removing the assumption that StringHeap is always present in the metadata when computing table information (jbevain#665)

ivan · ivan · commit 6d7e4a53b579 · 2020-05-14T17:02:27.000+02:00
diff --git a/Mono.Cecil.PE/ImageReader.cs b/Mono.Cecil.PE/ImageReader.cs
@@ -481,7 +481,7 @@ void ComputeTableInformations ()
 		{
 			uint offset = (uint) BaseStream.Position - table_heap_offset - image.MetadataSection.PointerToRawData; // header
 
-			int stridx_size = image.StringHeap.IndexSize;
+			int stridx_size = image.StringHeap != null ? image.StringHeap.IndexSize : 2;
 			int guididx_size = image.GuidHeap != null ? image.GuidHeap.IndexSize : 2;
 			int blobidx_size = image.BlobHeap != null ? image.BlobHeap.IndexSize : 2;
 

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ void ComputeTableInformations ()`
`481`	`481`	`{`
`482`	`482`	`uint offset = (uint) BaseStream.Position - table_heap_offset - image.MetadataSection.PointerToRawData; // header`
`483`	`483`
`484`		`- int stridx_size = image.StringHeap.IndexSize;`
	`484`	`+ int stridx_size = image.StringHeap != null ? image.StringHeap.IndexSize : 2;`
`485`	`485`	`int guididx_size = image.GuidHeap != null ? image.GuidHeap.IndexSize : 2;`
`486`	`486`	`int blobidx_size = image.BlobHeap != null ? image.BlobHeap.IndexSize : 2;`
`487`	`487`