[Libreoffice-commits] core.git: basctl/source

Norbert Thiebaud nthiebaud at gmail.com
Thu Feb 21 23:36:31 PST 2013


 basctl/source/basicide/basides2.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit d1ccb1eea871ca4064693b58d2926d4939018614
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Feb 18 01:52:15 2013 -0600

    coverity#735665 Dereference after null check
    
    Change-Id: I9d217789116602838dabbf93e81ab8d0467c5c7b
    Reviewed-on: https://gerrit.libreoffice.org/2217
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 3337f9f..e08fe95 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -213,10 +213,12 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const OUStrin
     }
     pTabBar->InsertPage( (sal_uInt16)nKey, aModName );
     pTabBar->Sort();
-    pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
-    if ( !pCurWin )
-        SetCurWindow( pWin, false, false );
-
+    if(pWin)
+    {
+        pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
+        if ( !pCurWin )
+            SetCurWindow( pWin, false, false );
+    }
     bCreatingWindow = false;
     return pWin;
 }


More information about the Libreoffice-commits mailing list