xcode 9 runtime checks showed nullptr access here in dialogs sample

codereader · Jun 11, 2017 · df898c0 · df898c0
1 parent 0873b80
commit df898c0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
@@ -155,7 +155,8 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
     // that case, statusbar appearance shouldn't change. It also shouldn't
     // change if a window-modal sheet attached to this window is key.
     wxTopLevelWindow *tlw = wxDynamicCast(MacGetTopLevelWindow(), wxTopLevelWindow);
-    wxWindow *keyWindow = wxNonOwnedWindow::GetFromWXWindow(wxOSXGetKeyWindow())->MacGetTopLevelWindow();
+    wxNonOwnedWindow* directKeyWindow = wxNonOwnedWindow::GetFromWXWindow(wxOSXGetKeyWindow());
+    wxWindow *keyWindow = directKeyWindow ? directKeyWindow->MacGetTopLevelWindow() : NULL;
     while ( keyWindow && keyWindow != tlw )
     {
         wxDialog *dlg = wxDynamicCast(keyWindow, wxDialog);