From 97aa613bba013aa375ab0a33eee3452e778aa917 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 8 Feb 2023 10:34:30 +0100
Subject: [PATCH] Prevent null Panel children

---
 src/Avalonia.Controls/Controls.cs              | 18 ++++++++++++++++--
 .../Avalonia.Controls.UnitTests/PanelTests.cs  |  8 ++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Controls.cs b/src/Avalonia.Controls/Controls.cs
index 8b0e998f64..736c7e8a77 100644
--- a/src/Avalonia.Controls/Controls.cs
+++ b/src/Avalonia.Controls/Controls.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
 
@@ -13,7 +14,7 @@ namespace Avalonia.Controls
         /// </summary>
         public Controls()
         {
-            ResetBehavior = ResetBehavior.Remove;
+            Configure();
         }
 
         /// <summary>
@@ -21,9 +22,22 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="items">The initial items in the collection.</param>
         public Controls(IEnumerable<Control> items)
-            : base(items)
+        {
+            Configure();
+            AddRange(items); // virtual member call in ctor, ok for our current implementation
+        }
+
+        private void Configure()
         {
             ResetBehavior = ResetBehavior.Remove;
+            Validate = item =>
+            {
+                if (item is null)
+                {
+                    throw new ArgumentNullException(nameof(item),
+                        $"A null control cannot be added to a {nameof(Controls)} collection.");
+                }
+            };
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index f189638c7d..a31f0dd4c2 100644
--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
@@ -133,5 +134,12 @@ namespace Avalonia.Controls.UnitTests
 
             renderer.Verify(x => x.AddDirty(target), Times.Once);
         }
+
+        [Fact]
+        public void Adding_Null_Child_Should_Throw()
+        {
+            var panel = new Panel();
+            Assert.Throws<ArgumentNullException>(() => panel.Children.Add(null!));
+        }
     }
 }