[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 012e30066a83dda4d20b87834944c818a91a2aab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 24 13:13:59 2014 +0000

    coverity#1158240 Dereference before null check
    
    Change-Id: I5ce6d5514c6bb2298dd00c43d21a43dba55268c3
    (cherry picked from commit 6c7b64bad403fb6eeac6e79d356f456f741a00d4)
    Reviewed-on: https://gerrit.libreoffice.org/10139
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7312c7b..ed42bf4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2190,8 +2190,8 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
                             }
                             while( !pNode->IsTxtNode() && pPaM->GetPoint()->nNode >= 0 );
 
-                            // Subtrackt previous text node's length
-                            if( pNode && pNode->IsTxtNode() )
+                            // Subtract previous text node's length
+                            if( pNode->IsTxtNode() )
                             {
                                 pTxtNode = pNode->GetTxtNode();
                                 if( nLen < pTxtNode->Len() )