lotuswordpro/qa/cppunit/data/fail/null-2.lwp |binary
lotuswordpro/source/filter/lwpfrib.cxx | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b7bf06d5d6f640df1304b605a2eaa5276f998dcb
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 8 09:25:46 2016 +0100
foundry may be null
Change-Id: I39359389a42e35e0131db1d0451fbd5531843f75
diff --git a/lotuswordpro/qa/cppunit/data/fail/null-2.lwp
b/lotuswordpro/qa/cppunit/data/fail/null-2.lwp
new file mode 100644
index 0000000..cd7e072
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/null-2.lwp differ
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx
b/lotuswordpro/source/filter/lwpfrib.cxx
index f0673e9..64f49ee 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -425,7 +425,8 @@ rtl::Reference<XFFont> LwpFrib::GetFont()
if(m_pModifiers&&m_pModifiers->FontID)
{
LwpFoundry* pFoundry = m_pPara->GetFoundry();
- pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
+ if (pFoundry)
+ pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
