From 5e381ffbe7069a454dc807113ab4058fad005c55 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 18 Sep 2017 10:47:25 +0100 Subject: allow events to accumulate past limit if an exception is pending MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic54c31961b887e06267aba1ceb0378508d24ded0 Reviewed-on: https://gerrit.libreoffice.org/42411 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sax/source/fastparser/fastparser.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'sax') diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 59dd995ce0f5..5281ca14920e 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -550,6 +550,13 @@ Event& Entity::getEvent( CallbackType aType ) return maSharedEvent; EventList& rEventList = getEventList(); + if (mnProducedEventsSize == rEventList.maEvents.size()) + { + SAL_WARN_IF(!maSavedException.hasValue(), "sax", + "Event vector should only exceed " << mnEventListSize << + " temporarily while an exception is pending"); + rEventList.maEvents.resize(mnProducedEventsSize + 1); + } Event& rEvent = rEventList.maEvents[mnProducedEventsSize++]; rEvent.maType = aType; return rEvent; @@ -927,7 +934,7 @@ void FastSaxParserImpl::produce( bool bForceFlush ) { Entity& rEntity = getEntity(); if (bForceFlush || - rEntity.mnProducedEventsSize == Entity::mnEventListSize) + rEntity.mnProducedEventsSize >= Entity::mnEventListSize) { osl::ResettableMutexGuard aGuard(rEntity.maEventProtector); -- cgit