projects
/
ldk-java
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2fd040e
)
Fix leak in manual memory management in PeerTest
author
Matt Corallo
<git@bluematt.me>
Thu, 28 Jan 2021 23:23:11 +0000
(18:23 -0500)
committer
Matt Corallo
<git@bluematt.me>
Thu, 28 Jan 2021 23:23:11 +0000
(18:23 -0500)
src/test/java/org/ldk/PeerTest.java
patch
|
blob
|
history
diff --git
a/src/test/java/org/ldk/PeerTest.java
b/src/test/java/org/ldk/PeerTest.java
index 2cabf2540e030bae688f14c2a785f6b18d4f7e23..be652d2be19d6e1768b3382a597f99694ce72f41 100644
(file)
--- a/
src/test/java/org/ldk/PeerTest.java
+++ b/
src/test/java/org/ldk/PeerTest.java
@@
-5,7
+5,9
@@
import org.bitcoinj.script.Script;
import org.junit.jupiter.api.Test;
import org.ldk.impl.bindings;
import org.ldk.enums.*;
import org.junit.jupiter.api.Test;
import org.ldk.impl.bindings;
import org.ldk.enums.*;
+import org.ldk.structs.Result_NoneChannelMonitorUpdateErrZ;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.Arrays;
import java.util.HashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@
-32,6
+34,7
@@
public class PeerTest {
bindings.LDKBroadcasterInterface broad_trait;
bindings.LDKLogger log_trait;
bindings.LDKWatch watcher;
bindings.LDKBroadcasterInterface broad_trait;
bindings.LDKLogger log_trait;
bindings.LDKWatch watcher;
+ ArrayList<Long> results_to_free;
Peer(byte seed) {
this.log_trait = (String arg)-> System.out.println(seed + ": " + arg);
Peer(byte seed) {
this.log_trait = (String arg)-> System.out.println(seed + ": " + arg);
@@
-41,6
+44,7
@@
public class PeerTest {
this.broad_trait = tx -> {
// We should broadcast
};
this.broad_trait = tx -> {
// We should broadcast
};
+ this.results_to_free = new ArrayList<>();
this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait);
this.monitors = new HashMap<>();
this.watcher = new bindings.LDKWatch() {
this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait);
this.monitors = new HashMap<>();
this.watcher = new bindings.LDKWatch() {
@@
-50,7
+54,9
@@
public class PeerTest {
assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null;
}
bindings.OutPoint_free(funding_txo);
assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null;
}
bindings.OutPoint_free(funding_txo);
- return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ results_to_free.add(res);
+ return res;
}
@Override
}
@Override
@@
-64,7
+70,9
@@
public class PeerTest {
}
bindings.OutPoint_free(funding_txo);
bindings.ChannelMonitorUpdate_free(update);
}
bindings.OutPoint_free(funding_txo);
bindings.ChannelMonitorUpdate_free(update);
- return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ results_to_free.add(res);
+ return res;
}
@Override
}
@Override
@@
-142,6
+150,9
@@
public class PeerTest {
bindings.ChannelMonitor_free(mon);
}
}
bindings.ChannelMonitor_free(mon);
}
}
+ for (Long res : results_to_free) {
+ bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res);
+ }
}
}
}
}