summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-15 09:02:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-02-15 09:02:23 +0000
commit4e0ac535a96dc461a795d399677123eebf0cf787 (patch)
tree41cfe3702323e01cba29c92069ec2bb358aa579d /sw
parent82f65d5753eca4549a4e37285e75315a94e1a863 (diff)
coverity#1400531 Dereference before null check
Change-Id: Iff64a2dd599c6881e92e0cf49a0f535104a49ac1
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/fly.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 383ef523d5c8..02b32b028efe 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -437,12 +437,7 @@ void SwFlyFrame::FinitDrawObj()
}
}
}
- if(!pFormat)
- {
- GetVirtDrawObj()->SetUserCall(nullptr);
- delete GetVirtDrawObj();
- return;
- }
+
bool bOtherFramesAround(false);
SwFlyDrawContact* pContact(nullptr);
pFormat->CallSwClientNotify(sw::KillDrawHint(this, bOtherFramesAround, pContact));