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

NTCP: Catch IAE in Reader, possibly a race with cancelled key?

Browse Source 
http://zzz.i2p/topics/2968
This commit is contained in:
zzz
2020-10-12 13:28:57 +00:00
parent 11e1747ffc
commit f028002c11
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/transport/ntcp/Reader.java
View File

@ -121,8 +121,18 @@ class Reader {
// FailedEstablishState.receive() (race - see below) // FailedEstablishState.receive() (race - see below)
if (_log.shouldWarn()) if (_log.shouldWarn())
_log.warn("Error in the ntcp reader", ise); _log.warn("Error in the ntcp reader", ise);
} catch (IllegalArgumentException iae) {
// probably a race with a cancelled key
// java.lang.IllegalArgumentException
// at java.nio.Buffer.position(Unknown Source)
// at java.nio.HeapByteBuffer.get(Unknown Source)
// at net.i2p.router.transport.ntcp.NTCPConnection$NTCP2ReadState.receive(NTCPConnection.java:2054)
// at net.i2p.router.transport.ntcp.NTCPConnection.recvEncryptedI2NP(NTCPConnection.java:1383)
// at net.i2p.router.transport.ntcp.Reader.processRead(Reader.java:170)
if (_log.shouldWarn())
_log.warn("Error in the ntcp reader", iae);
} catch (RuntimeException re) { } catch (RuntimeException re) {
_log.log(Log.CRIT, "Error in the ntcp reader", re); _log.error("Error in the ntcp reader", re);
} }
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("end read for " + con); _log.debug("end read for " + con);