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

NTCP: Catch race in Reader (ticket #1534)

Browse Source
This commit is contained in:
zzz
2015-05-13 10:52:26 +00:00
parent a3b1327934
commit 0e17c560b3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,8 +98,10 @@ class Reader {
if (keepReading) { if (keepReading) {
// keep on reading the same one // keep on reading the same one
} else { } else {
if (con != null) {
_liveReads.remove(con); _liveReads.remove(con);
con = null; con = null;
}
if (_pendingConnections.isEmpty()) { if (_pendingConnections.isEmpty()) {
_pendingConnections.wait(); _pendingConnections.wait();
} else { } else {
@@ -116,6 +118,10 @@ class Reader {
_log.debug("begin read for " + con); _log.debug("begin read for " + con);
try { try {
processRead(con); processRead(con);
} catch (IllegalStateException ise) {
// FailedEstablishState.receive() (race - see below)
if (_log.shouldWarn())
_log.warn("Error in the ntcp reader", ise);
} catch (RuntimeException re) { } catch (RuntimeException re) {
_log.log(Log.CRIT, "Error in the ntcp reader", re); _log.log(Log.CRIT, "Error in the ntcp reader", re);
} }
@@ -153,6 +159,7 @@ class Reader {
EventPumper.releaseBuf(buf); EventPumper.releaseBuf(buf);
break; break;
} }
// FIXME call est.isCorrupt() before also? throws ISE here... see above
est.receive(buf); est.receive(buf);
EventPumper.releaseBuf(buf); EventPumper.releaseBuf(buf);
if (est.isCorrupt()) { if (est.isCorrupt()) {