From 7d4c77e374310bef538465d11980d1d610cbe0f1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 30 Aug 2015 20:14:16 +0100 Subject: pClientData can be null Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc --- filter/source/msfilter/svdfppt.cxx | 2 +- sd/qa/unit/data/ppt/pass/crash-3.ppt | Bin 0 -> 7681 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 sd/qa/unit/data/ppt/pass/crash-3.ppt diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ad20a860e610..744b5e91553b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2588,7 +2588,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 = *static_cast(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 000000000000..daa0102db45c Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/crash-3.ppt differ -- cgit