From 5dbdada6aab0c432e490459c92a5a77ac1d595d8 Mon Sep 17 00:00:00 2001
From: jwiesemann <jwiesemann@trac.wxwidgets.org>
Date: Thu, 27 May 2021 23:54:07 +0200
Subject: [PATCH] Fix wxMask copy ctor from an uninitialized mask in wxMSW

Don't assert when copying an invalid, i.e. uninitialized, mask in wxMSW.

Do initialize m_maskBitmap in any case in the copy ctor.

Closes #19171.
---
 src/msw/bitmap.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 1c3486a3e8..30b2d439a6 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1483,6 +1483,15 @@ wxMask::wxMask()
 wxMask::wxMask(const wxMask &mask)
       : wxObject()
 {
+    m_maskBitmap = 0;
+
+    if ( !mask.m_maskBitmap )
+    {
+        // Copying uninitialized mask shouldn't do anything, and notably not
+        // result in an assertion failure below.
+        return;
+    }
+
     BITMAP bmp;
 
     HDC srcDC = CreateCompatibleDC(0);