summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-11-24 13:06:13 +0000
committerAndras Timar <andras.timar@collabora.com>2021-10-19 13:57:44 +0200
commit099afacc8120aa830a5e06faa8aab990a5b1e284 (patch)
tree0565fbc29303830e5c22d364975ecd2c690cf596
parentofz#26676 null deref (diff)
downloadcore-099afacc8120aa830a5e06faa8aab990a5b1e284.tar.gz
core-099afacc8120aa830a5e06faa8aab990a5b1e284.zip
ofz#27817 null deref
Change-Id: I16da6f6f78dfd0a4bc17017275a6644d6e4340c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106533 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 48d052a9f1bdbd34e1819b45ab83f51b84911702)
-rw-r--r--sw/source/filter/basflt/fltshell.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index ee4d46bbc833..46d6a8a4098b 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -652,9 +652,8 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
{
SwTextNode const*const pTextNode(
aRegion.End()->nNode.GetNode().GetTextNode());
- assert(pTextNode);
- SwTextField const*const pField(pTextNode->GetFieldTextAttrAt(
- aRegion.End()->nContent.GetIndex() - 1, true));
+ SwTextField const*const pField = pTextNode ? pTextNode->GetFieldTextAttrAt(
+ aRegion.End()->nContent.GetIndex() - 1, true) : nullptr;
if (pField)
{
SwPostItField const*const pPostIt(