AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NTCP: Fix rare NPE sending termination

Browse Source 
reported by drzed
This commit is contained in:
zzz
2022-12-14 10:51:34 -05:00
parent 4443fb464a
commit 28a79def5a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@@ -904,11 +904,14 @@ public class NTCPConnection implements Closeable {
synchronized(_writeLock) {
if (_sender != null) {
sendNTCP2(dataBuf.getData(), blocks);
_sender.destroy();
// this "plugs" the NTCP2 sender, so sendNTCP2()
// won't send any more after the termination.
_sender = null;
new DelayedCloser();
// sendNTCP2() -> wantsWrite() -> pumper.processWrite() -> fail -> close() -> NPE
if (_sender != null) {
_sender.destroy();
// this "plugs" the NTCP2 sender, so sendNTCP2()
// won't send any more after the termination.
_sender = null;
new DelayedCloser();
}
}
}
releaseReadBuf(dataBuf);