ofz#4848 Null-dereference READ

Change-Id: I632aca7e3f59b7edf48c8c35eff4abf1946af652

ofz#4848 Null-dereference READ
Change-Id: I632aca7e3f59b7edf48c8c35eff4abf1946af652
d4d0b1a2 · Caolán McNamara · 45e5b5da · d4d0b1a2
Kaydet (Commit) d4d0b1a2 authored Ara 31, 2017 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

swhtml.cxx sw/source/filter/html/swhtml.cxx +3 -3

No files found.
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1462,10 +1462,10 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
        if( !aToken.isEmpty() && ' '==aToken[0] && !IsReadPRE() )
        {
            sal_Int32 nPos = m_pPam->GetPoint()->nContent.GetIndex();
-            if( nPos )
+            const SwTextNode* pTextNode = nPos ? m_pPam->GetPoint()->nNode.GetNode().GetTextNode() : nullptr;
+            if (pTextNode)
            {
-                const OUString& rText =
-                    m_pPam->GetPoint()->nNode.GetNode().GetTextNode()->GetText();
+                const OUString& rText = pTextNode->GetText();
                sal_Unicode cLast = rText[--nPos];
                if( ' ' == cLast || '\x0a' == cLast)
                    aToken = aToken.copy(1);