mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#101971 OleLoad under structured exception guards

Browse Source 
sample pptx crashes down in the depths of (apparently pre-installed on
32bit Windows 10) Flash.ocx

Change-Id: I4e083d492e56e72df47b2c172d7f07f0e39b82ea
Reviewed-on: https://gerrit.libreoffice.org/29199
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Caolán McNamara
2016-09-22 21:11:56 +01:00
committed by Stephan Bergmann
parent 52977bdbef
commit 373b44a2fc
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
embeddedobj/source/msole/olecomponent.cxx
View File

@@ -715,6 +715,19 @@ sal_Bool OleComponent::InitializeObject_Impl()
return sal_True; return sal_True;
} }
namespace
{
HRESULT OleLoadSeh(LPSTORAGE pIStorage, LPVOID* ppObj)
{
HRESULT hr = E_FAIL;
__try {
hr = OleLoad(pIStorage, IID_IUnknown, NULL, ppObj);
} __except( EXCEPTION_EXECUTE_HANDLER ) {
return E_FAIL;
}
return hr;
}
}
void OleComponent::LoadEmbeddedObject( const OUString& aTempURL ) void OleComponent::LoadEmbeddedObject( const OUString& aTempURL )
{ {
@@ -730,7 +743,7 @@ void OleComponent::LoadEmbeddedObject( const OUString& aTempURL )
if ( FAILED( hr ) || !m_pNativeImpl->m_pIStorage ) if ( FAILED( hr ) || !m_pNativeImpl->m_pIStorage )
throw io::IOException(); // TODO: transport error code? throw io::IOException(); // TODO: transport error code?
hr = OleLoad( m_pNativeImpl->m_pIStorage, IID_IUnknown, NULL, (void**)&m_pNativeImpl->m_pObj ); hr = OleLoadSeh(m_pNativeImpl->m_pIStorage, (void**)&m_pNativeImpl->m_pObj);
if ( FAILED( hr ) || !m_pNativeImpl->m_pObj ) if ( FAILED( hr ) || !m_pNativeImpl->m_pObj )
{ {
throw uno::RuntimeException(); throw uno::RuntimeException();
@@ -963,7 +976,7 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent )
{ {
hr = pObjectStorage->CopyTo( 0, NULL, NULL, m_pNativeImpl->m_pIStorage ); hr = pObjectStorage->CopyTo( 0, NULL, NULL, m_pNativeImpl->m_pIStorage );
if ( SUCCEEDED( hr ) ) if ( SUCCEEDED( hr ) )
hr = OleLoad( m_pNativeImpl->m_pIStorage, IID_IUnknown, NULL, (void**)&m_pNativeImpl->m_pObj ); hr = OleLoadSeh(m_pNativeImpl->m_pIStorage, (void**)&m_pNativeImpl->m_pObj);
} }
} }
} }