mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#705649 Resource leak

Browse Source 
Change-Id: I4899851af28b20a20c7b07301c22ddacdbb89b27
This commit is contained in:
Caolán McNamara
2014-03-09 20:43:00 +00:00
parent e37886a2f6
commit f1529383d4
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
filter/source/msfilter/msdffimp.cxx
View File

@@ -4887,7 +4887,9 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
{ {
SvxMSDffImportData& rImportData = *(SvxMSDffImportData*)pData; SvxMSDffImportData& rImportData = *(SvxMSDffImportData*)pData;
SvxMSDffImportRec* pImpRec = new SvxMSDffImportRec; SvxMSDffImportRec* pImpRec = new SvxMSDffImportRec;
bool bDeleteImpRec = true;
SvxMSDffImportRec* pTextImpRec = pImpRec; SvxMSDffImportRec* pTextImpRec = pImpRec;
bool bDeleteTextImpRec = false;
// fill Import Record with data // fill Import Record with data
pImpRec->nShapeId = rObjData.nShapeId; pImpRec->nShapeId = rObjData.nShapeId;
@@ -5083,6 +5085,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
pTextObj = new SdrRectObj(OBJ_TEXT, rTextRect); pTextObj = new SdrRectObj(OBJ_TEXT, rTextRect);
pTextImpRec = new SvxMSDffImportRec(*pImpRec); pTextImpRec = new SvxMSDffImportRec(*pImpRec);
bDeleteTextImpRec = true;
// the vertical paragraph indents are part of the BoundRect, // the vertical paragraph indents are part of the BoundRect,
// here we 'remove' them by calculating // here we 'remove' them by calculating
@@ -5362,6 +5365,9 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
{ {
pImpRec->pObj = pOrgObj; pImpRec->pObj = pOrgObj;
rImportData.aRecords.insert( pImpRec ); rImportData.aRecords.insert( pImpRec );
bDeleteImpRec = false;
if (pImpRec == pTextImpRec)
bDeleteTextImpRec = false;
} }
if( pTextObj && (pOrgObj != pTextObj) ) if( pTextObj && (pOrgObj != pTextObj) )
@@ -5370,6 +5376,9 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
pImpRec->nShapeId |= 0x8000000; pImpRec->nShapeId |= 0x8000000;
pTextImpRec->pObj = pTextObj; pTextImpRec->pObj = pTextObj;
rImportData.aRecords.insert( pTextImpRec ); rImportData.aRecords.insert( pTextImpRec );
bDeleteTextImpRec = false;
if (pTextImpRec == pImpRec)
bDeleteImpRec = false;
} }
// entry in the z-order-list in order to complement the pointer to this object // entry in the z-order-list in order to complement the pointer to this object
@@ -5383,12 +5392,12 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
( ( (sal_uLong)pImpRec->aTextId.nTxBxS ) << 16 ) ( ( (sal_uLong)pImpRec->aTextId.nTxBxS ) << 16 )
+ pImpRec->aTextId.nSequence, pObj ); + pImpRec->aTextId.nSequence, pObj );
} }
else
{ if (bDeleteImpRec)
if (pTextImpRec != pImpRec)
delete pTextImpRec;
delete pImpRec; delete pImpRec;
}
if (bDeleteTextImpRec)
delete pTextImpRec;
} }
return pObj; return pObj;