InjectionConsumerInfo.Equals could throw null ref ex. Fixes #693.

simpleinjector · Apr 26, 2019 · 6af294e · 6af294e
1 parent 697c628
commit 6af294e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/SimpleInjector/InjectionConsumerInfo.cs b/src/SimpleInjector/InjectionConsumerInfo.cs
@@ -89,11 +89,12 @@ public Type ServiceType
             this.ImplementationType.GetHashCode() ^ this.Target.GetHashCode();
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => this.Equals(obj as InjectionConsumerInfo);
+        public override bool Equals(object obj) => obj is InjectionConsumerInfo info && this.Equals(info);
 
         /// <inheritdoc />
         public bool Equals(InjectionConsumerInfo other) =>
-            this.ImplementationType.Equals(other.ImplementationType)
+            other != null
+            && this.ImplementationType.Equals(other.ImplementationType)
             && this.Target.Equals(other.Target);
 
         /// <inheritdoc />