filter/source/msfilter/svdfppt.cxx | 6 +++++- sd/qa/unit/data/ppt/pass/hang-8.ppt |binary 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit d604263ea184c16ce2b23fd3fcfa823ab1ff62a5 Author: Caolán McNamara <[email protected]> Date: Thu Aug 27 14:06:04 2015 +0100 check stream state after read attempt Change-Id: Ie3836f2e95acab963634181a07565343501f00f8 (cherry picked from commit 9a695e071020639926f8b038aba64eb016a1801a) Reviewed-on: https://gerrit.libreoffice.org/18092 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 29f0b36..0ac8030 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5252,9 +5252,13 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe PPTCharPropSet aCharPropSet( nCurrentPara ); if ( bTextPropAtom ) + { ReadCharProps( rIn, aCharPropSet, aString, nCharCount, nCharAnzRead, bTextPropAtom, nExtParaPos, aStyleTextProp9, nExtParaFlags, nBuBlip, nHasAnm, nAnmScheme ); + if (!rIn.good()) + break; + } else nCharCount = nStringLen; @@ -5330,7 +5334,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe break; } } - } + } if ( !aCharPropList.empty() && ( aCharPropList.back()->mnParagraph != nCurrentPara ) ) { PPTCharPropSet* pCharPropSet = new PPTCharPropSet( *aCharPropList.back(), nCurrentPara ); diff --git a/sd/qa/unit/data/ppt/pass/hang-8.ppt b/sd/qa/unit/data/ppt/pass/hang-8.ppt new file mode 100644 index 0000000..0f52bd5 Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-8.ppt differ
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
