Fix #1910: NRE in ViewState.Equals

5 years ago · 7f427a3c6f
1 changed files with 3 additions and 1 deletions
--- a/ILSpy/TextView/DecompilerTextView.cs
+++ b/ILSpy/TextView/DecompilerTextView.cs
@ -1070,7 +1070,9 @@ namespace ICSharpCode.ILSpy.TextView
				@@ -1070,7 +1070,9 @@ namespace ICSharpCode.ILSpy.TextView

 		public virtual bool Equals(ViewState other)
 		{
-			return ViewedUri == other.ViewedUri && (DecompiledNodes == other.DecompiledNodes || DecompiledNodes?.SetEquals(other.DecompiledNodes) == true);
+			return other != null
+				&& ViewedUri == other.ViewedUri
+				&& (DecompiledNodes == other.DecompiledNodes || DecompiledNodes?.SetEquals(other.DecompiledNodes) == true);
 		}
 	}