pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix #2443: do not use this()-ctor initializers by accident if base type is unknown.

pull/2447/head
Siegfried Pammer 4 years ago
parent
8eafbb3d90
commit
ec1b9a4ccd
4 changed files with 128 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs
  2. 28
      ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue2443.cs
  3. 87
      ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue2443.il
  4. 11
      ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs

6
ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs
Unescape View File

@ -200,6 +200,12 @@ namespace ICSharpCode.Decompiler.Tests @@ -200,6 +200,12 @@ namespace ICSharpCode.Decompiler.Tests
Run();
}
[Test]
public void Issue2443()
{
Run();
}
[Test]
public void Issue2260SwitchString()
{

28
ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue2443.cs
Unescape View File

@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
using System;
using System.Reflection;
using ClassLibrary1;
[assembly: AssemblyCompany("ConsoleApp8")]
[assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
[assembly: AssemblyProduct("ConsoleApp8")]
[assembly: AssemblyTitle("ConsoleApp8")]
namespace ConsoleApp8
{
internal class Program : Class1
{
public Program(string _)
: base(_)
{
Console.WriteLine("Class1(string)<-Program(string)");
}
private static void Main(string[] args)
{
new Program("");
Console.WriteLine("Hello World!");
}
}
}

87
ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue2443.il
Unescape View File

@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@

// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0
// Copyright (c) Microsoft Corporation. All rights reserved.
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly extern ClassLibrary1
{
.ver 1:0:0:0
}
.assembly ConsoleApp8
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.Versioning.TargetFrameworkAttribute::.ctor(string) = ( 01 00 1C 2E 4E 45 54 46 72 61 6D 65 77 6F 72 6B // ....NETFramework
2C 56 65 72 73 69 6F 6E 3D 76 34 2E 37 2E 32 01 // ,Version=v4.7.2.
00 54 0E 14 46 72 61 6D 65 77 6F 72 6B 44 69 73 // .T..FrameworkDis
70 6C 61 79 4E 61 6D 65 14 2E 4E 45 54 20 46 72 // playName..NET Fr
61 6D 65 77 6F 72 6B 20 34 2E 37 2E 32 ) // amework 4.7.2
.custom instance void [mscorlib]System.Reflection.AssemblyCompanyAttribute::.ctor(string) = ( 01 00 0B 43 6F 6E 73 6F 6C 65 41 70 70 38 00 00 ) // ...ConsoleApp8..
.custom instance void [mscorlib]System.Reflection.AssemblyConfigurationAttribute::.ctor(string) = ( 01 00 07 52 65 6C 65 61 73 65 00 00 ) // ...Release..
.custom instance void [mscorlib]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 31 2E 30 2E 30 2E 30 00 00 ) // ...1.0.0.0..
.custom instance void [mscorlib]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 05 31 2E 30 2E 30 00 00 ) // ...1.0.0..
.custom instance void [mscorlib]System.Reflection.AssemblyProductAttribute::.ctor(string) = ( 01 00 0B 43 6F 6E 73 6F 6C 65 41 70 70 38 00 00 ) // ...ConsoleApp8..
.custom instance void [mscorlib]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 0B 43 6F 6E 73 6F 6C 65 41 70 70 38 00 00 ) // ...ConsoleApp8..
.hash algorithm 0x00008004
.ver 1:0:0:0
}
.module ConsoleApp8.exe
// MVID: {C71BB5CC-A98C-4CF4-B8A4-000055F94187}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x02890000
// =============== CLASS MEMBERS DECLARATION ===================
.class private auto ansi beforefieldinit ConsoleApp8.Program
extends [ClassLibrary1]ClassLibrary1.Class1
{
.method public hidebysig specialname rtspecialname
instance void .ctor(string _) cil managed
{
// Code size 18 (0x12)
.maxstack 8
IL_0000: ldarg.0
IL_0001: ldarg.1
IL_0002: call instance void [ClassLibrary1]ClassLibrary1.Class1::.ctor(string)
IL_0007: ldstr "Class1(string)<-Program(string)"
IL_000c: call void [mscorlib]System.Console::WriteLine(string)
IL_0011: ret
} // end of method Program::.ctor
.method private hidebysig static void Main(string[] args) cil managed
{
.entrypoint
// Code size 22 (0x16)
.maxstack 8
IL_0000: ldstr ""
IL_0005: newobj instance void ConsoleApp8.Program::.ctor(string)
IL_000a: pop
IL_000b: ldstr "Hello World!"
IL_0010: call void [mscorlib]System.Console::WriteLine(string)
IL_0015: ret
} // end of method Program::Main
} // end of class ConsoleApp8.Program
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************
// WARNING: Created Win32 resource file Issue2443.res

11
ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs
Unescape View File

@ -76,10 +76,13 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms @@ -76,10 +76,13 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
// Ignore casts, those might be added if references are missing.
if (target is CastExpression cast)
target = cast.Expression;
if (target is ThisReferenceExpression)
ci.ConstructorInitializerType = ConstructorInitializerType.This;
else if (target is BaseReferenceExpression)
ci.ConstructorInitializerType = ConstructorInitializerType.Base;
if (target is ThisReferenceExpression or BaseReferenceExpression)
{
if (ctor.DeclaringTypeDefinition == currentCtor.DeclaringTypeDefinition)
ci.ConstructorInitializerType = ConstructorInitializerType.This;
else
ci.ConstructorInitializerType = ConstructorInitializerType.Base;
}
else
return;
// Move arguments from invocation to initializer:

Write Preview
Loading…
Cancel
Save