From e8795d338a7afa6f132998f9406a86077251c7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Fri, 21 Sep 2012 08:01:46 +0200 Subject: [PATCH] Fixed possible null reference exception. --- .../CodeIssues/VariableDeclaredInWideScopeIssue.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs index 83facbfdd9..57df04e568 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs @@ -210,6 +210,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring var binaryOperator = node as BinaryOperatorExpression; if (binaryOperator != null) { var resolveResult = context.Resolve(binaryOperator) as OperatorResolveResult; + if (resolveResult == null) + return false; // Built-in operators are ok, user defined ones not so much return resolveResult.UserDefinedOperatorMethod != null; } @@ -226,6 +228,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring var binaryOperator = node as BinaryOperatorExpression; if (binaryOperator != null) { var resolveResult = context.Resolve(binaryOperator) as OperatorResolveResult; + if (resolveResult == null) + return false; return resolveResult.UserDefinedOperatorMethod != null; } return IsConflictingAssignment(node, identifiers, members, locals);