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

[Caolán McNamara]

 sw/source/core/layout/layact.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit deea33b8c1389df925699c011c682f522e3dba71
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 13 10:40:58 2014 +0100

    coverity#1213064 Dereference after null check
    
    Change-Id: Icf80cff1f68e85bf9103aedc95ccca80e2d32681

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index dce0dd6..91e726c 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1344,7 +1344,8 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect )
                     if(aSpaceToPrevPage.Height() > 0 && aSpaceToPrevPage.Width() > 0)
                         pImp->GetShell()->AddPaintRect( aSpaceToPrevPage );
 
-                    pSh->GetOut()->DrawRect( aSpaceToPrevPage.SVRect() );
+                    if (pSh)
+                        pSh->GetOut()->DrawRect( aSpaceToPrevPage.SVRect() );
 
                     // left
                     aSpaceToPrevPage = aPageRect;