From 4eed9c45306c1ed8074bc9bcab634cb2f6979437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 16 May 2014 20:45:01 +0100 Subject: [PATCH] fix leak on pasting draw items into office --- ...Model-s-pImpl-of-fallback-TargetDocu.patch | 73 +++++++++++++++++++ libreoffice.spec | 2 + 2 files changed, 75 insertions(+) create mode 100644 0002-coverity-SfxBaseModel-s-pImpl-of-fallback-TargetDocu.patch diff --git a/0002-coverity-SfxBaseModel-s-pImpl-of-fallback-TargetDocu.patch b/0002-coverity-SfxBaseModel-s-pImpl-of-fallback-TargetDocu.patch new file mode 100644 index 0000000..5866bc7 --- /dev/null +++ b/0002-coverity-SfxBaseModel-s-pImpl-of-fallback-TargetDocu.patch @@ -0,0 +1,73 @@ +From 195ced38c64e2599ca64713a3f6ed9791824e28b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 16 May 2014 16:36:13 +0100 +Subject: [PATCH 2/2] coverity: SfxBaseModel's pImpl of fallback TargetDocument + for paste leaks + +e.g. repeatedly pasting a metafile into writer and deleting it. + +==13369== 342 (232 direct, 110 indirect) bytes in 1 blocks are definitely lost in loss record 19,396 of 22,170 +==13369== at 0x4A06965: operator new(unsigned long) (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) +==13369== by 0x686D72E: SfxBaseModel::SfxBaseModel(SfxObjectShell*) (sfxbasemodel.cxx:518) +==13369== by 0x288CA9C1: SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel*) (unomod.cxx:255) +==13369== by 0x28961055: SvxDrawingLayerImport(SdrModel*, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, char const*) (xmlexport.cxx:164) +==13369== by 0x28960FA2: SvxDrawingLayerImport(SdrModel*, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) (xmlexport.cxx:148) +==13369== by 0x2896175E: SvxDrawingLayerImport(SdrModel*, com::sun::star::uno::Reference const&) (xmlexport.cxx:254) +==13369== by 0x240B1002: SwFEShell::Paste(SvStream&, unsigned short, Point const*) (fecopy.cxx:1333) +==13369== by 0x247B981A: SwTransferable::_PasteSdrFormat(TransferableDataHelper&, SwWrtShell&, unsigned short, Point const*, unsigned char, bool) (swdtflvr.cxx:2207) +==13369== by 0x247B678E: SwTransferable::PasteData(TransferableDataHelper&, SwWrtShell&, unsigned short, unsigned long, unsigned short, bool, bool, Point const*, signed char, bool) (swdtflvr.cxx:1481) +==13369== by 0x247B5AE4: SwTransferable::Paste(SwWrtShell&, TransferableDataHelper&) (swdtflvr.cxx:1150) +==13369== by 0x2488FCCE: SwBaseShell::ExecClpbrd(SfxRequest&) (basesh.cxx:277) + + Reference< lang::XComponent > xTargetDocument( xComponent ); + if( !xTargetDocument.is() ) + { +> xTargetDocument = new SvxUnoDrawingModel( pModel ); + pModel->setUnoModel( Reference< XInterface >::query( xTargetDocument ) ); + } + +Change-Id: I3bd0fc983d9b6bdcdc91071a4ec3d2c584397ebf +--- + sfx2/source/doc/sfxbasemodel.cxx | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx +index 3ad6fc9..b50afe1 100644 +--- a/sfx2/source/doc/sfxbasemodel.cxx ++++ b/sfx2/source/doc/sfxbasemodel.cxx +@@ -523,18 +523,15 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell ) + } + } + +- + // destructor +- +- + SfxBaseModel::~SfxBaseModel() + { ++ //In SvxDrawingLayerImport when !xTargetDocument the fallback SvxUnoDrawingModel created there ++ //never gets disposed called on it, so m_pData leaks. ++ delete m_pData, m_pData = 0; + } + +- + // XInterface +- +- + Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException, std::exception ) + { + if ( ( !m_bSupportEmbeddedScripts && rType.equals( cppu::UnoType::get() ) ) +@@ -545,10 +542,7 @@ Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( Runti + return SfxBaseModel_Base::queryInterface( rType ); + } + +- + // XInterface +- +- + void SAL_CALL SfxBaseModel::acquire() throw( ) + { + // Attention: +-- +1.9.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 6a60784..c9c84f0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -310,6 +310,7 @@ Patch51: 0001-update-libxmlsec-config.-to-support-ppc64le.patch Patch52: 0001-fix-for-doxygen-1.8.7.patch Patch53: 0001-Use-SVM-metafile-instead-of-PNG-for-diagrams-SmartAr.patch Patch54: 0001-fix-memory-leak-on-pasting-metafiles-into-writer.patch +Patch55: 0002-coverity-SfxBaseModel-s-pImpl-of-fallback-TargetDocu.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2276,6 +2277,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : * Fri May 16 2014 Caolán McNamara - 1:4.2.4.2-14 - render smart-art with a vector format so it can be scaled nicely - fix leak on pasting metafiles into office +- fix leak on pasting draw items into office * Thu May 15 2014 David Tardon - 1:4.2.4.2-13 - fix SDK doc generation with doxygen 1.8.7