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

Norbert Thiebaud nthiebaud at gmail.com
Wed Jun 26 11:25:39 PDT 2013


 svx/source/svdraw/svdhdl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4d5fc661d37d03129b8054e494c03bed1933231d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jun 26 02:19:45 2013 -0500

    coverity#1027651 Dereference after null check
    
    Change-Id: Id90ef9f43578d952fd8d7872d4fd2fd622d07dbd
    Reviewed-on: https://gerrit.libreoffice.org/4529
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 7058e0c..34f5149 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2364,7 +2364,7 @@ void SdrCropViewHdl::CreateB2dIAObject()
     SdrMarkView* pView = pHdlList ? pHdlList->GetView() : 0;
     SdrPageView* pPageView = pView ? pView->GetSdrPageView() : 0;
 
-    if(pPageView && pView->areMarkHandlesHidden())
+    if(!pPageView || (pPageView && pView->areMarkHandlesHidden()))
     {
         return;
     }
@@ -2525,7 +2525,7 @@ void SdrCropViewHdl::CreateB2dIAObject()
     for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
     {
         // const SdrPageViewWinRec& rPageViewWinRec = rPageViewWinList[b];
-        const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
+        const SdrPageWindow& rPageWindow = *(pPageView->GetPageWindow(b));
 
         if(rPageWindow.GetPaintWindow().OutputToWindow())
         {


More information about the Libreoffice-commits mailing list