From 69852a56f588fe0e744aa11e7577eeb351f29670 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 6 Jul 2021 12:16:44 +0200
Subject: [PATCH] Don't allow self as parent/owner window.

---
 src/Avalonia.Controls/Window.cs               | 17 +++++++++++--
 .../WindowTests.cs                            | 24 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 2d369dae8c..9f6c605d46 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -635,9 +635,17 @@ namespace Avalonia.Controls
                 throw new InvalidOperationException("Cannot re-show a closed window.");
             }
 
-            if (parent != null && parent.PlatformImpl == null)
+            if (parent != null)
             {
-                throw new InvalidOperationException("Cannot Show a Window with a closed parent.");
+                if (parent.PlatformImpl == null)
+                {
+                    throw new InvalidOperationException("Cannot Show a Window with a closed parent.");
+                }
+
+                if (parent == this)
+                {
+                    throw new InvalidOperationException("A Window cannot be its own parent.");
+                }
             }
 
             if (IsVisible)
@@ -719,6 +727,11 @@ namespace Avalonia.Controls
                 throw new InvalidOperationException("Cannot Show a Window with a closed owner.");
             }
 
+            if (owner == this)
+            {
+                throw new InvalidOperationException("A Window cannot be its own owner.");
+            }
+
             if (IsVisible)
             {
                 throw new InvalidOperationException("The window is already being shown.");
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 2d4559ddba..5ba529292f 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -417,6 +417,30 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Calling_Show_With_Self_As_Parent_Window_Should_Throw()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new Window();
+
+                var ex = Assert.Throws<InvalidOperationException>(() => target.Show(target));
+                Assert.Equal("A Window cannot be its own parent.", ex.Message);
+            }
+        }
+
+        [Fact]
+        public async Task Calling_ShowDialog_With_Self_As_Parent_Window_Should_Throw()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new Window();
+
+                var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => target.ShowDialog(target));
+                Assert.Equal("A Window cannot be its own owner.", ex.Message);
+            }
+        }
+
         [Fact]
         public void Window_Should_Be_Centered_When_WindowStartupLocation_Is_CenterScreen()
         {