diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 11:31:21 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-02 18:11:33 +0200 |
| commit | ed48943694c167aa89a3c7f7c9e654cba44c3039 (patch) | |
| tree | 7d5caff042a49623321028b0f3895f7a67da0ff3 | |
| parent | da9abb54acd2159cc3069959f062a2b4ceb1d955 (diff) | |
forcepoint#62 null deref
Change-Id: I255aeb96c3763aa106128d3463e4fd55395ef8b8
Reviewed-on: https://gerrit.libreoffice.org/58409
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 9e434f2f5ad61092ee685369bce93d90a28db149)
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 518be4bad9ca..36aea5291757 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4564,7 +4564,7 @@ void DomainMapper_Impl::PopFieldContext() else { FormControlHelper::Pointer_t pFormControlHelper(pContext->getFormControlHelper()); - if (pFormControlHelper.get() != nullptr && pFormControlHelper->hasFFDataHandler() ) + if (pFormControlHelper.get() != nullptr && pFormControlHelper->hasFFDataHandler() && xCrsr.is()) { uno::Reference< text::XFormField > xFormField( pContext->GetFormField() ); xToInsert.set(xFormField, uno::UNO_QUERY); @@ -4580,7 +4580,7 @@ void DomainMapper_Impl::PopFieldContext() pFormControlHelper->insertControl(xTxtRange); } } - else if(!pContext->GetHyperlinkURL().isEmpty()) + else if (!pContext->GetHyperlinkURL().isEmpty() && xCrsr.is()) { xCrsr->gotoEnd( true ); |