From 0eecca25109472586ae0380f9290bec7503460e6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 May 2021 15:53:10 +0100 Subject: ofz#34601 teardown crash under oss-fuzz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icbb1500a85f956c8100878d6a0bef30b98440c32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116114 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- svx/source/svdraw/svdobj.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'svx/source') diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index df38cf4a6d7a..15b9cc6dcfcf 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -579,9 +579,14 @@ SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool() mpGlobalItemPool->SetSecondaryPool(pGlobalOutlPool.get()); mpGlobalItemPool->SetDefaultMetric(SdrEngineDefaults::GetMapUnit()); mpGlobalItemPool->FreezeIdRanges(); - uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(comphelper::getProcessComponentContext()); - uno::Reference< frame::XTerminateListener > xListener( new TerminateListener ); - xDesktop->addTerminateListener( xListener ); + if (utl::ConfigManager::IsFuzzing()) + mpGlobalItemPool->acquire(); + else + { + uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(comphelper::getProcessComponentContext()); + uno::Reference< frame::XTerminateListener > xListener( new TerminateListener ); + xDesktop->addTerminateListener( xListener ); + } } return *mpGlobalItemPool; -- cgit