Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
fix other memleak
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Raab committed Aug 6, 2014
1 parent e6edbae commit f137b99
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/libtools/tests/testtool_metamergestrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ TEST_F(MetaMergeStrategyTest, MergesMetaWithInnerStrategy)
conflictKey = result.getConflictSet ().at (0);

ThreeWayMerge merger;
// TODO @fberlakovich: memleak
merger.addConflictStrategy (new OneSideStrategy (OURS));
MetaMergeStrategy metaStrategy (merger);
metaStrategy.resolveConflict (task, conflictKey, result);
Expand Down
4 changes: 3 additions & 1 deletion tests/test_ks.c
Original file line number Diff line number Diff line change
Expand Up @@ -2508,7 +2508,9 @@ void test_ksToArray()

succeed_if (elektraKsToMemArray(0, keyArray) < 0, "wrong result on null pointer");
succeed_if (elektraKsToMemArray(ks, 0) < 0, "wrong result on null buffer");
succeed_if (elektraKsToMemArray(ksNew(0), keyArray) == 0, "wrong result on empty keyset");
KeySet *empty = ksNew(0);
succeed_if (elektraKsToMemArray(empty, keyArray) == 0, "wrong result on empty keyset");
ksDel(empty);

free (keyArray);
ksDel (ks);
Expand Down

0 comments on commit f137b99

Please sign in to comment.