From 67cba3af55e94debe8eb6392bc8d0b2f00a7a199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 31 Aug 2014 15:00:16 +0100 Subject: [PATCH] coverity#707318 Uncaught exception Change-Id: Ib2d4b2e6c4df70da1d8a4b5bf39f69efea45ad5e --- sw/source/ui/uno/swdetect.cxx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 4304b67bb6d3..c37e9fcfe22e 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -86,12 +86,19 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor if ( pInStrm->remainingSize() == 0 ) return OUString(); - SotStorageRef aStorage = new SotStorage ( pInStrm, false ); - if ( !aStorage->GetError() ) + try { - bIsDetected = aStorage->IsContained( "WordDocument" ); - if ( bIsDetected && aTypeName.startsWith( "writer_MS_Word_97" ) ) - bIsDetected = ( aStorage->IsContained("0Table") || aStorage->IsContained("1Table") ); + SotStorageRef aStorage = new SotStorage ( pInStrm, false ); + if ( !aStorage->GetError() ) + { + bIsDetected = aStorage->IsContained( "WordDocument" ); + if ( bIsDetected && aTypeName.startsWith( "writer_MS_Word_97" ) ) + bIsDetected = ( aStorage->IsContained("0Table") || aStorage->IsContained("1Table") ); + } + } + catch (...) + { + bIsDetected = false; } }