svx/source/svdraw/svdograf.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec98e41a4ad88ce7c9a76f1e0a35157e10a48213
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 15 13:49:20 2014 +0000
Resolves: rhbz#1104068 crash converting fontwork to curve
via metafile, i.e. take fontwork example 11, convert
to metafile and convert that to curve
was coverity#1019335 Dereference after null check
(cherry picked from commit d77cc9d2cdc702f2b2016498df107f4120d27690)
Change-Id: I309e0c3f8a0630991e2aad64f995567e0920be3b
Reviewed-on: https://gerrit.libreoffice.org/9649
Tested-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 0a672d3..0446977 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1011,7 +1011,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage )
ImpLinkAbmeldung();
}
- if(!pModel && !GetStyleSheet() && pNewPage->GetModel())
+ if(!pModel && !GetStyleSheet() && pNewPage && pNewPage->GetModel())
{
// #i119287# Set default StyleSheet for SdrGrafObj here, it is
different from 'Default'. This
// needs to be done before the style 'Default' is set from the
:SetModel() call which is triggered
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
