From: David Surovell <davids@osafoundation.org>
Date: Tue, 28 Mar 2006 19:55:24 +0000 (+0000)
Subject: fix null-deref
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/30c23e741eb95ae26ffdc1e2e31f8f39ff6cf721

fix null-deref


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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index a665917aed..c7c49f7f2b 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -94,7 +94,7 @@ static const EventTypeSpec eventList[] =
 
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
     { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
-    
+
     { kEventClassWindow , kEventWindowShown } ,
     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,
@@ -448,7 +448,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
     Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
     Point windowMouseLocation = screenMouseLocation ;
 
-    WindowRef window ;
+    WindowRef window = NULL;
     short windowPart = ::FindWindow(screenMouseLocation, &window);
 
     wxWindow* currentMouseWindow = NULL ;
@@ -1416,11 +1416,11 @@ bool wxTopLevelWindowMac::IsFullScreen() const
     return m_macFullScreenData != NULL ;
 }
 
-void wxTopLevelWindowMac::SetExtraStyle(long exStyle) 
+void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
 {
     if ( GetExtraStyle() == exStyle )
         return ;
-    
+
     wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;
 
 #if TARGET_API_MAC_OSX
@@ -1433,8 +1433,8 @@ void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
 #endif
 }
 
+// TODO: switch to structure bounds -
 // we are still using coordinates of the content view
-// TODO: switch to structure bounds
 //
 void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
 {