From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 15 May 2002 20:03:07 +0000 (+0000)
Subject: Check for null return value in wxClientDC constructor
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7882729eb52c116cdfbe18d73a69cf91259cffcd

Check for null return value in wxClientDC constructor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index eb9d6e467b..bc1a0827a4 100644
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -85,6 +85,8 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
 	wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
 	WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
 	wxPoint origin = window->GetClientAreaOrigin() ;
 	wxSize size = window->GetClientSize() ;
diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index eb9d6e467b..bc1a0827a4 100644
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -85,6 +85,8 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
 	wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
 	WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
 	wxPoint origin = window->GetClientAreaOrigin() ;
 	wxSize size = window->GetClientSize() ;