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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/utlui/content.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b008de9e47ea9938e0b615f3171a7c273884596
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 09:09:55 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 16 12:46:59 2022 +0200

    cid#1500410 Explicit null dereferenced
    
    Change-Id: Idc4e3ca35a0f68ffe8c3b32053c9eea1c6426ff5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138344
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 172156b65a21..f05611d2cc59 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3491,7 +3491,7 @@ static void 
lcl_SelectByContentTypeAndAddress(SwContentTree* pThis, weld::TreeVi
             std::unique_ptr<weld::TreeIter> 
xFirstSelected(rContentTree.make_iterator());
             if (!rContentTree.get_selected(xFirstSelected.get()))
                 xFirstSelected.reset();
-            if (rContentTree.count_selected_rows() != 1 ||
+            if (rContentTree.count_selected_rows() != 1 || !xFirstSelected ||
                     rContentTree.iter_compare(*xIter, *xFirstSelected) != 0)
             {
                 // unselect all entries and make passed entry visible and 
selected