diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 11:31:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 15:39:52 +0200 |
| commit | 805609a5a3845fdd67d375be850484340593e567 (patch) | |
| tree | db9aae98881d4d711440d5b848d44c640ca754e6 /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | 61ebd4fac9da6a56ae89beeb850a719820a87920 (diff) | |
forcepoint#62 null deref
Change-Id: I255aeb96c3763aa106128d3463e4fd55395ef8b8
Reviewed-on: https://gerrit.libreoffice.org/58408
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -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 9e35322c5fa7..0bee265b0187 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5023,7 +5023,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); @@ -5039,7 +5039,7 @@ void DomainMapper_Impl::PopFieldContext() pFormControlHelper->insertControl(xTxtRange); } } - else if(!pContext->GetHyperlinkURL().isEmpty()) + else if (!pContext->GetHyperlinkURL().isEmpty() && xCrsr.is()) { xCrsr->gotoEnd( true ); |