Fix NullReferenceException in ResizeOptions equality logic #6128 (#6308)

MudBlazor · Feb 11, 2023 · 9c47347 · 9c47347
1 parent c1e8e62
commit 9c47347
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/src/MudBlazor.UnitTests/Services/ResizeOptionsTests.cs b/src/MudBlazor.UnitTests/Services/ResizeOptionsTests.cs
@@ -244,5 +244,15 @@ public void Equals_NotTheSame_DiffersInBreakpointDefinitions_DifferentValues()
             option1.Should().NotBe(option2);
             option2.Should().NotBe(option1);
         }
+
+        [Test]
+        public void ComparingWithNull_ShouldNot_Fail()
+        {
+            var option = new ResizeOptions();
+            // this should not cause nullref
+            (option == null).Should().Be(false);
+            (option != null).Should().Be(true);
+        }
     }
+
 }
diff --git a/src/MudBlazor/Services/ResizeListener/ResizeOptions.cs b/src/MudBlazor/Services/ResizeListener/ResizeOptions.cs
@@ -31,8 +31,16 @@ public class ResizeOptions : IEquatable<ResizeOptions>
         /// </summary>
         public Dictionary<string, int> BreakpointDefinitions { get; set; } = new();
 
-        public static bool operator ==(ResizeOptions l, ResizeOptions r) => l.Equals(r);
-        public static bool operator !=(ResizeOptions l, ResizeOptions r) => !l.Equals(r);
+        public static bool operator ==(ResizeOptions l, ResizeOptions r)
+        {
+            if (l is null && r is null)
+                return true;
+            if (l is null && r is not null)
+                return false;
+            return l.Equals(r);
+        }
+
+        public static bool operator !=(ResizeOptions l, ResizeOptions r) => !(l == r);
 
         public override bool Equals(object obj)
         {
@@ -43,6 +51,8 @@ public override bool Equals(object obj)
 
         public bool Equals(ResizeOptions other)
         {
+            if (other is null)
+                return false;
             if (ReportRate != other.ReportRate ||
                EnableLogging != other.EnableLogging ||
                SuppressInitEvent != other.SuppressInitEvent ||
@@ -51,36 +61,21 @@ public bool Equals(ResizeOptions other)
                 return false;
             }
 
-            if (BreakpointDefinitions is not null)
-            {
-                if (other.BreakpointDefinitions is null) { return false; }
-                else
-                {
-                    if (BreakpointDefinitions.Count != other.BreakpointDefinitions.Count)
-                    {
-                        return false;
-                    }
-
-                    foreach (var item in BreakpointDefinitions.Keys)
-                    {
-                        if (other.BreakpointDefinitions.ContainsKey(item) == false)
-                        {
-                            return false;
-                        }
-
-                        if (BreakpointDefinitions[item] != other.BreakpointDefinitions[item])
-                        {
-                            return false;
-                        }
-                    }
-
-                    return true;
-                }
-            }
-            else
-            {
+            if (BreakpointDefinitions is null)
                 return other.BreakpointDefinitions is null;
+            if (other.BreakpointDefinitions is null) 
+                return false;
+            if (BreakpointDefinitions.Count != other.BreakpointDefinitions.Count)
+                return false;
+            foreach (var item in BreakpointDefinitions.Keys)
+            {
+                if (other.BreakpointDefinitions.ContainsKey(item) == false)
+                    return false;
+                if (BreakpointDefinitions[item] != other.BreakpointDefinitions[item])
+                    return false;
             }
+
+            return true;
         }
 
         public override int GetHashCode() => ReportRate;