coverity#1158080 Dereference after null check

Change-Id: I708977778bcd6d488d8f61703acbe90c62f6f2e4

coverity#1158080 Dereference after null check
Change-Id: I708977778bcd6d488d8f61703acbe90c62f6f2e4
7b1c0188 · Caolán McNamara · d93c204f · 7b1c0188
Kaydet (Commit) 7b1c0188 authored Ock 24, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

thints.cxx sw/source/core/txtnode/thints.cxx +4 -2

No files found.
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3421,8 +3421,10 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
                const sal_Int32 *pEndIdx = pHt->End();
                // Ueberlappt das Attribut den Bereich?

-                if( pEndIdx &&
-                    nLen ? ( nAttrStart < nEnd && nBegin < *pEndIdx )
+                if (!pEndIdx)
+                    continue;
+
+                if( nLen ? ( nAttrStart < nEnd && nBegin < *pEndIdx )
                         : (( nAttrStart < nBegin &&
                                ( pHt->DontExpand() ? nBegin < *pEndIdx
                                                    : nBegin <= *pEndIdx )) ||