Fix ArgumentNullException in RedundantCatchClauseIssue.GatherVisitor.IsRedundant()

dgrunwald · dgrunwald · commit 6147f605bbbf · 2014-05-10T20:53:54.000+02:00
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
@@ -146,8 +146,11 @@ bool IsRedundant(CatchClause catchClause)
 					if (nextClause != null) {
 						if (nextClause.Type.IsNull && !IsThrowsClause(nextClause))
 							return false;
-						if (!IsThrowsClause(nextClause) && type.GetDefinition ().IsDerivedFrom (ctx.Resolve (nextClause.Type).Type.GetDefinition ()))
-							return false;
+						if (!IsThrowsClause(nextClause)) {
+							var typeDef = type.GetDefinition();
+							if (typeDef == null || typeDef.IsDerivedFrom(ctx.Resolve(nextClause.Type).Type.GetDefinition()))
+								return false;
+						}
 					}
 					n = n.NextSibling;
 				}

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,11 @@ bool IsRedundant(CatchClause catchClause)`
`146`	`146`	`if (nextClause != null) {`
`147`	`147`	`if (nextClause.Type.IsNull && !IsThrowsClause(nextClause))`
`148`	`148`	`return false;`
`149`		`- if (!IsThrowsClause(nextClause) && type.GetDefinition ().IsDerivedFrom (ctx.Resolve (nextClause.Type).Type.GetDefinition ()))`
`150`		`- return false;`
	`149`	`+ if (!IsThrowsClause(nextClause)) {`
	`150`	`+ var typeDef = type.GetDefinition();`
	`151`	`+ if (typeDef == null \|\| typeDef.IsDerivedFrom(ctx.Resolve(nextClause.Type).Type.GetDefinition()))`
	`152`	`+ return false;`
	`153`	`+ }`
`151`	`154`	`}`
`152`	`155`	`n = n.NextSibling;`
`153`	`156`	`}`