cid#441406 dereference after null

someone already tried to fix this, but the check was too late

Change-Id: I63a8140009bc3f52ac924972a32c22603cf01971

1 files changed, 8 insertions, 8 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 16d854424506..28171684cdd8 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1322,16 +1322,16 @@ Window* Application::GetDefDialogParent()
             while( pWin->mpWindowImpl && pWin->mpWindowImpl->mpParent )
                 pWin = pWin->mpWindowImpl->mpParent;
 
-            if( (pWin->mpWindowImpl->mnStyle & WB_INTROWIN) == 0 )
+            // check for corrupted window hierarchy, #122232#, may be we now crash somewhere else
+            if( !pWin->mpWindowImpl )
             {
-                // check for corrupted window hierarchy, #122232#, may be we now crash somewhere else
-                if( !pWin->mpWindowImpl )
-                {
-                    OSL_FAIL( "Window hierarchy corrupted!" );
-                    pSVData->maWinData.mpFocusWin = NULL;   // avoid further access
-                    return NULL;
-                }
+                OSL_FAIL( "Window hierarchy corrupted!" );
+                pSVData->maWinData.mpFocusWin = NULL;   // avoid further access
+                return NULL;
+            }
 
+            if( (pWin->mpWindowImpl->mnStyle & WB_INTROWIN) == 0 )
+            {
                 return pWin->mpWindowImpl->mpFrameWindow->ImplGetWindow();
             }
         }