Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 34f8b5e

Browse files
fix NRE when trying to go to the definition of a ctor or cctor from the profiling results
1 parent f2fbd8b commit 34f8b5e

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,13 @@ protected IMember GetMemberFromName(ITypeDefinition c, string name, ReadOnlyColl
4141
if (name == null || c == null)
4242
return null;
4343

44-
if (name == ".ctor" || name == ".cctor") // Constructor
45-
name = name.Replace('.', '#');
46-
47-
if (name.StartsWith("get_") || name.StartsWith("set_")) {
44+
if (name.StartsWith("get_", StringComparison.Ordinal) || name.StartsWith("set_", StringComparison.Ordinal)) {
4845
// Property Getter or Setter
4946
name = name.Substring(4);
5047
IProperty prop = c.Properties.FirstOrDefault(p => p.Name == name);
5148
if (prop != null)
5249
return prop;
53-
} else if (name.StartsWith("add_") || name.StartsWith("remove_")) {
50+
} else if (name.StartsWith("add_", StringComparison.Ordinal) || name.StartsWith("remove_", StringComparison.Ordinal)) {
5451
name = name.Substring(4);
5552
IEvent ev = c.Events.FirstOrDefault(e => e.Name == name);
5653
if (ev != null)

src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override void Run()
3939
ITypeDefinition c = GetClassFromName(selectedItem.FullyQualifiedClassName);
4040
if (c != null) {
4141
IMember member = GetMemberFromName(c, selectedItem.MethodName, selectedItem.Parameters);
42-
if (!member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) {
42+
if (member != null && !member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) {
4343
FileName fn = new FileName(member.Region.FileName);
4444
SD.FileService.JumpToFilePosition(fn, member.Region.BeginLine, member.Region.BeginColumn);
4545
}

0 commit comments

Comments
 (0)