sw/source/core/layout/flyincnt.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eae57fb4035d7471ca2477dd1e81eb158843747e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Dec 11 08:49:28 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 11 11:42:03 2020 +0100
cid#1470587 Dereference after null check
since...
commit 4d6f00a097e68715c63c3388b1183bf08fa8cdbb
Date: Thu Dec 10 00:09:32 2020 +0100
flyincnt: Modify no more
Change-Id: Ief0ed9248c89b74e325746401c321a34990477ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107582
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/layout/flyincnt.cxx
b/sw/source/core/layout/flyincnt.cxx
index be7b5722a593..69417d7f07ee 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -118,7 +118,7 @@ void SwFlyInContentFrame::SwClientNotify(const SwModify&,
const SfxHint& rHint)
aTweakedChgs.first->ClearItem(RES_FRMMACRO);
aSuperArgs = std::pair<const SfxPoolItem*, const
SfxPoolItem*>(aTweakedChgs.first.get(), aTweakedChgs.second.get());
}
- } else if(pNewAttrSetChg->GetChgSet()->Count())
+ } else if (pNewAttrSetChg && pNewAttrSetChg->GetChgSet()->Count())
aSuperArgs = std::pair<const SfxPoolItem*, const
SfxPoolItem*>(pLegacy->m_pOld, pLegacy->m_pNew);
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
