writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 805609a5a3845fdd67d375be850484340593e567
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Aug 1 11:31:21 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 1 15:39:52 2018 +0200
forcepoint#62 null deref
Change-Id: I255aeb96c3763aa106128d3463e4fd55395ef8b8
Reviewed-on: https://gerrit.libreoffice.org/58408
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
