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

[Julien Nabet]

 sw/source/core/text/porglue.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc0111e5fdc9ecf991420e99b08260ed4f0d2bdb
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Mar 20 22:27:22 2013 +0100

    coverity#704931 Explicit null dereferenced
    
    Change-Id: I03fe61ace1ab408d51e93f1e447591bb4eb9449c
    Reviewed-on: https://gerrit.libreoffice.org/2881
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index bceadd8..8ce717d 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -218,7 +218,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
         }
 
         // Two adjoining FlyPortions are merged
-        if( pRight && pLeft->GetPortion() == pRight )
+        if( pRight && pLeft && pLeft->GetPortion() == pRight )
         {
             pRight->MoveAllGlue( pLeft );
             pRight = 0;