diff options
| -rw-r--r-- | svtools/source/misc/embedhlp.cxx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 6325a76c4ec3..135ad3055500 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -560,16 +560,25 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( sal_Bool bUpdate ) const { const sal_Int32 nConstBufferSize = 32000; SvStream *pStream = new SvMemoryStream( 32000, 32000 ); - sal_Int32 nRead=0; - uno::Sequence < sal_Int8 > aSequence ( nConstBufferSize ); - do + try + { + sal_Int32 nRead=0; + uno::Sequence < sal_Int8 > aSequence ( nConstBufferSize ); + do + { + nRead = xStream->readBytes ( aSequence, nConstBufferSize ); + pStream->Write( aSequence.getConstArray(), nRead ); + } + while ( nRead == nConstBufferSize ); + pStream->Seek(0); + return pStream; + } + catch (const uno::Exception& ex) { - nRead = xStream->readBytes ( aSequence, nConstBufferSize ); - pStream->Write( aSequence.getConstArray(), nRead ); + SAL_WARN("svtools", "discarding broken embedded object preview: " << ex.Message); + delete pStream; + xStream.clear(); } - while ( nRead == nConstBufferSize ); - pStream->Seek(0); - return pStream; } } |