Add updated submodule

AndrewChien · Mar 30, 2018 · a246ca9 · a246ca9
1 parent d81e8d1
commit a246ca9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/de4dot.blocks/Instr.cs b/de4dot.blocks/Instr.cs
@@ -38,7 +38,11 @@ public object Operand {
 
 		// Returns the variable or null if it's not a ldloc/stloc instruction. It does not return
 		// a local variable if it's a ldloca/ldloca.s instruction.
-		public static Local GetLocalVar(IList<Local> locals, Instr instr) => instr.Instruction.GetLocal(locals);
+		public static Local GetLocalVar(IList<Local> locals, Instr instr) {
+			if (instr.Instruction.IsLdloc() || instr.Instruction.IsStloc())
+				return instr.Instruction.GetLocal(locals);
+			return null;
+		}
 
 		static public bool IsFallThrough(OpCode opCode) {
 			switch (opCode.FlowControl) {

diff --git a/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs b/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs
@@ -447,15 +447,8 @@ TypeSig ReadArrayType() {
 
 		ByRefSig ReadByRefType() => new ByRefSig(ReadTypeSig());
 
-		public uint ReadVariableLengthUInt32() {
-			reader.ReadCompressedUInt32(out uint val);
-			return val;
-		}
-
-		public int ReadVariableLengthInt32() {
-			reader.ReadCompressedUInt32(out uint val);
-			return (int)val;
-		}
+		public uint ReadVariableLengthUInt32() => reader.ReadCompressedUInt32();
+		public int ReadVariableLengthInt32() => (int)reader.ReadCompressedUInt32();
 
 		int GetMetadataOffset() {
 			reader.Position = reader.Length - 4;

diff --git a/de4dot.code/deobfuscators/ConstantsReader.cs b/de4dot.code/deobfuscators/ConstantsReader.cs
@@ -644,6 +644,8 @@ protected virtual bool GetLocalConstantInt32(Instruction instr, out int value) {
 			value = 0;
 			if (locals == null)
 				return false;
+			if (!instr.IsLdloc() && !instr.IsStloc())
+				return false;
 			var local = instr.GetLocal(locals);
 			if (local == null)
 				return false;
@@ -661,6 +663,8 @@ protected virtual bool GetLocalConstantInt64(Instruction instr, out long value)
 			value = 0;
 			if (locals == null)
 				return false;
+			if (!instr.IsLdloc() && !instr.IsStloc())
+				return false;
 			var local = instr.GetLocal(locals);
 			if (local == null)
 				return false;
@@ -678,6 +682,8 @@ protected virtual bool GetLocalConstantDouble(Instruction instr, out double valu
 			value = 0;
 			if (locals == null)
 				return false;
+			if (!instr.IsLdloc() && !instr.IsStloc())
+				return false;
 			var local = instr.GetLocal(locals);
 			if (local == null)
 				return false;

diff --git a/dnlib b/dnlib
+9 −6		Examples/Example6.cs
+2 −0		README.md
+3 −3		src/DotNet/AssemblyNameComparer.cs
+1 −1		src/DotNet/CustomAttributeReader.cs
+4 −3		src/DotNet/Emit/Instruction.cs
+1 −1		src/DotNet/MD/BlobStream.cs
+1 −1		src/DotNet/MD/USStream.cs
+4 −1		src/DotNet/Pdb/PdbState.cs
+8 −0		src/DotNet/Pdb/PdbUtils.cs
+2 −2		src/DotNet/Pdb/Portable/LocalConstantSigBlobReader.cs
+1 −1		src/DotNet/Pdb/WindowsPdb/WindowsPdbWriter.cs
+10 −2		src/DotNet/SigComparer.cs
+15 −15		src/DotNet/SignatureReader.cs
+5 −3		src/DotNet/TypeDef.cs
+1 −1		src/DotNet/Writer/BlobHeap.cs
+48 −0		src/DotNet/Writer/DataReaderHeap.cs
+91 −15		src/DotNet/Writer/Metadata.cs
+14 −6		src/DotNet/Writer/ModuleWriterBase.cs
+1 −1		src/DotNet/Writer/USHeap.cs
+0 −20		src/IO/AlignedByteArrayDataStream.cs
+0 −17		src/IO/AlignedNativeMemoryDataStream.cs
+14 −60		src/IO/DataReader.cs
+0 −28		src/IO/DataStream.cs
+0 −4		src/IO/EmptyDataStream.cs
+0 −17		src/IO/UnalignedByteArrayDataStream.cs
+0 −4		src/IO/UnalignedNativeMemoryDataStream.cs
+2 −0		src/dnlib.csproj