filter/source/msfilter/svdfppt.cxx | 2 +-
sd/qa/unit/data/ppt/pass/crash-3.ppt |binary
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0ae8d68a0b7c6d2be21b5e903114b0fe3de5a49c
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Aug 30 20:14:16 2015 +0100
pClientData can be null
Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc
(cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1)
Reviewed-on: https://gerrit.libreoffice.org/18150
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index e1e14b8..73283e2 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2576,7 +2576,7 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16
nNum, Color& rColor )
bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData,
sal_uInt32 nId ) const
{
bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId );
- if ( !bRet )
+ if (!bRet && pClientData)
{
ProcessData& rData = *( (ProcessData*)pClientData );
PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
diff --git a/sd/qa/unit/data/ppt/pass/crash-3.ppt
b/sd/qa/unit/data/ppt/pass/crash-3.ppt
new file mode 100644
index 0000000..daa0102
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/crash-3.ppt differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
