diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-01 14:50:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-04 12:49:59 +0000 |
| commit | 02f0102b8bd7793ddd2fe7a54c46d41b9a608cec (patch) | |
| tree | 681ab6c40925a32a71cc6361cf538bced70d7c23 /svx/source/svdraw/svdmodel.cxx | |
| parent | suppress legacy locales, fdo#44112 related (diff) | |
| download | core-02f0102b8bd7793ddd2fe7a54c46d41b9a608cec.tar.gz core-02f0102b8bd7793ddd2fe7a54c46d41b9a608cec.zip | |
prevent memory leak
Found by Lsan.
Returning this or a heap allocated object asks for trouble. Let the
caller handle it and return null instead of this.
Change-Id: I7586e103bef5a8c2727adfe214b052d6962d4467
Reviewed-on: https://gerrit.libreoffice.org/10716
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 7ea96c3daf80..54596ab03c25 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1818,43 +1818,42 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe { if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, false, &pPoolItem)) { - const SfxPoolItem* pItem = pPoolItem; + const SfxPoolItem* pResultItem = NULL; switch( nWhich ) { case XATTR_FILLBITMAP: - pItem = ((XFillBitmapItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XFillBitmapItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; case XATTR_LINEDASH: - pItem = ((XLineDashItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XLineDashItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; case XATTR_LINESTART: - pItem = ((XLineStartItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XLineStartItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; case XATTR_LINEEND: - pItem = ((XLineEndItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XLineEndItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; case XATTR_FILLGRADIENT: - pItem = ((XFillGradientItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XFillGradientItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; case XATTR_FILLFLOATTRANSPARENCE: // allow all kinds of XFillFloatTransparenceItem to be set - pItem = ((XFillFloatTransparenceItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XFillFloatTransparenceItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; case XATTR_FILLHATCH: - pItem = ((XFillHatchItem*)pItem)->checkForUniqueItem( pNewModel ); + pResultItem = ((XFillHatchItem*)pPoolItem)->checkForUniqueItem( pNewModel ); break; } // set item - if( pItem ) + if( pResultItem ) { - pDestSet->Put(*pItem); - - // delete item if it was a generated one - if( pItem != pPoolItem) - delete (SfxPoolItem*)pItem; + pDestSet->Put(*pResultItem); + delete (SfxPoolItem*)pResultItem; } + else + pDestSet->Put(*pPoolItem); } nWhich = aWhichIter.NextWhich(); } |