summaryrefslogtreecommitdiff
path: root/sax/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-01-05 15:36:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-01-06 16:08:55 +0100
commit2a88f62ac01daa72b6287a8cedccfb78579a6067 (patch)
treec868468f793e968ea07f31acf948dce4eec5686a /sax/source
parentdc885c071b71e6f6f76bedaecf7f0b1a81dd1d57 (diff)
ofz#4392 sax: guard access to Entity::maSavedException with mutex
The problem here is presumably that the parser thread reports a low-level SAX exception and the main thread reports a high-level filter exception at the same time, so both threads modify maSavedException concurrently. Change-Id: Ic8ce9a4992208a24a111c990a67be163858ddaf8 Reviewed-on: https://gerrit.libreoffice.org/47478 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sax/source')
-rw-r--r--sax/source/fastparser/fastparser.cxx33
1 files changed, 30 insertions, 3 deletions
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index c0d2282c922d..f48ad47f2937 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -173,6 +173,7 @@ struct Entity : public ParserData
// resource leaks), therefore any exception thrown by a UNO callback
// must be saved somewhere until the C-XmlParser is stopped.
css::uno::Any maSavedException;
+ osl::Mutex maSavedExceptionMutex;
void saveException( const Any & e );
void throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumentLocator,
bool mbDuringParse );
@@ -570,12 +571,20 @@ void Entity::throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumen
bool mbDuringParse )
{
// Error during parsing !
+ Any savedException;
+ {
+ osl::MutexGuard g(maSavedExceptionMutex);
+ if (maSavedException.hasValue())
+ {
+ savedException.setValue(&maSavedException, cppu::UnoType<decltype(maSavedException)>::get());
+ }
+ }
SAXParseException aExcept(
lclGetErrorMessage( mpParser,
xDocumentLocator->getSystemId(),
xDocumentLocator->getLineNumber() ),
Reference< XInterface >(),
- Any( &maSavedException, cppu::UnoType<decltype(maSavedException)>::get() ),
+ savedException,
xDocumentLocator->getPublicId(),
xDocumentLocator->getSystemId(),
xDocumentLocator->getLineNumber(),
@@ -607,7 +616,15 @@ void Entity::saveException( const Any & e )
// for XComponent; and yet expect to continue parsing.
SAL_WARN("sax", "Unexpected exception from XML parser "
<< e.get<Exception>());
- maSavedException = e;
+ osl::MutexGuard g(maSavedExceptionMutex);
+ if (maSavedException.hasValue())
+ {
+ SAL_INFO("sax.fastparser", "discarding exception, already have one");
+ }
+ else
+ {
+ maSavedException = e;
+ }
}
} // namespace
@@ -814,6 +831,8 @@ void FastSaxParserImpl::parseStream(const InputSource& rStructSource)
deleteUsedEvents();
// callbacks used inside XML_Parse may have caught an exception
+ // No need to lock maSavedExceptionMutex here because parser
+ // thread is joined.
if( rEntity.maSavedException.hasValue() )
rEntity.throwException( mxDocumentLocator, true );
}
@@ -1035,8 +1054,16 @@ void FastSaxParserImpl::parse()
}
// callbacks used inside XML_Parse may have caught an exception
- if( !bContinue || rEntity.maSavedException.hasValue() )
+ if (!bContinue)
+ {
rEntity.throwException( mxDocumentLocator, true );
+ }
+ osl::ClearableMutexGuard g(rEntity.maSavedExceptionMutex);
+ if (rEntity.maSavedException.hasValue())
+ {
+ g.clear();
+ rEntity.throwException( mxDocumentLocator, true );
+ }
} while( nRead > 0 );
rEntity.getEvent( DONE );
if( rEntity.mbEnableThreads )