Fix merge. Code used a much older dnlib version

RafaelRMachado · Oct 29, 2015 · eefa799 · eefa799
1 parent 7cde561
commit eefa799
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs b/de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs
@@ -476,7 +476,7 @@ bool Decrypt_v17_r73404(MyPEImage peImage, byte[] fileData, ref DumpedMethods du
 		DumpedMethods Decrypt_v17_r73404(MyPEImage peImage, byte[] fileData) {
 			var dumpedMethods = new DumpedMethods();
 
-			var methodDef = peImage.DotNetFile.MetaData.TablesStream.MethodTable;
+			var methodDef = peImage.MetaData.TablesStream.MethodTable;
 			for (uint rid = 1; rid <= methodDef.Rows; rid++) {
 				var dm = new DumpedMethod();
 				peImage.ReadMethodTableRowTo(dm, rid);
@@ -604,7 +604,7 @@ public override void Decrypt(byte[] fileData, int offset, uint k1, int size, out
 		DumpedMethods Decrypt(MyPEImage peImage, byte[] fileData, DecryptMethodData decrypter) {
 			var dumpedMethods = new DumpedMethods();
 
-			var methodDef = peImage.DotNetFile.MetaData.TablesStream.MethodTable;
+			var methodDef = peImage.MetaData.TablesStream.MethodTable;
 			for (uint rid = 1; rid <= methodDef.Rows; rid++) {
 				var dm = new DumpedMethod();
 				peImage.ReadMethodTableRowTo(dm, rid);

diff --git a/de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs b/de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs
@@ -364,7 +364,7 @@ static byte[] GetStreamsBuffer(MyPEImage peImage) {
 			var memStream = new MemoryStream();
 			var writer = new BinaryWriter(memStream);
 			var reader = peImage.Reader;
-			foreach (var mdStream in peImage.DotNetFile.MetaData.AllStreams) {
+			foreach (var mdStream in peImage.MetaData.AllStreams) {
 				reader.Position = (long)mdStream.StartOffset;
 				writer.Write(reader.ReadBytes((int)(mdStream.EndOffset - mdStream.StartOffset)));
 			}