summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-27 10:24:38 +0200
committerNoel Grandin <noel@peralex.com>2015-03-02 08:59:18 +0200
commit6fe4c54294308cf2c2574e4fbb0bdc61632448e1 (patch)
treeaf493e6da4269ed08e3c3c6df3e672d112a146de /connectivity
parent3c866bb8e42554ac96d3588208e167e7786e2d00 (diff)
cppcheck: fix memory leak
Change-Id: If73ed88d665d89f37f6caeb0ef1e9df703f063fe
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/macab/MacabHeader.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index d63c5f94d1e0..e4c1d388024b 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -198,11 +198,9 @@ macabfield **MacabHeader::sortRecord(const sal_Int32 _start, const sal_Int32 _le
sal_Int32 halfLength = floor(_length/2);
sal_Int32 fp = 0, lp = 0;
sal_Int32 i;
- macabfield **firstHalf = new macabfield *[halfLength];
- macabfield **lastHalf = new macabfield *[_length - halfLength];
+ macabfield **firstHalf = sortRecord(_start, halfLength);
+ macabfield **lastHalf = sortRecord(_start+halfLength, _length-halfLength);
- firstHalf = sortRecord(_start, halfLength);
- lastHalf = sortRecord(_start+halfLength, _length-halfLength);
for(i = 0; i < _length; i++)
{
if(compareFields(firstHalf[fp],lastHalf[lp]) < 0)
@@ -234,6 +232,8 @@ macabfield **MacabHeader::sortRecord(const sal_Int32 _start, const sal_Int32 _le
{
fields = sorted;
}
+ delete firstHalf;
+ delete lastHalf;
}
return sorted;
}