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

[Caolán McNamara (via logerrit)]

 sc/source/filter/html/htmlexp.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 50c1032b4d292c26015d102a1aede03a9ed8e555
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 14 09:54:40 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 15 15:36:45 2019 +0200

    cid#1448276 Dereference null return value
    
    Change-Id: I1f11115b730cb51d0aa59b99e15b5dacff4cd68e
    Reviewed-on: https://gerrit.libreoffice.org/75572
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 3e5acc29a43d..80c32814fac0 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1060,10 +1060,9 @@ void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, SC
     TAG_ON(aStrTD.makeStringAndClear().getStr());
 
     //write the note for this as the first thing in the tag
-    if (pDoc->HasNote(aPos))
+    ScPostIt* pNote = pDoc->HasNote(aPos) ? pDoc->GetNote(aPos) : nullptr;
+    if (pNote)
     {
-        ScPostIt* pNote = pDoc->GetNote(aPos);
-
         //create the comment indicator
         OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_anchor);
         aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_class)