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

Fortuna: Catch AIOOBE (ticket #1576)

Browse Source
This commit is contained in:
zzz
2015-05-31 12:43:06 +00:00
parent c58fd8f84e
commit 4521156ecb
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/src/net/i2p/util/FortunaRandomSource.java
View File

@ -262,8 +262,14 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
/** reseed the fortuna */ /** reseed the fortuna */
@Override @Override
public void feedEntropy(String source, byte[] data, int offset, int len) { public void feedEntropy(String source, byte[] data, int offset, int len) {
synchronized(_fortuna) { try {
_fortuna.addRandomBytes(data, offset, len); synchronized(_fortuna) {
_fortuna.addRandomBytes(data, offset, len);
}
} catch (Exception e) {
// AIOOBE seen, root cause unknown, ticket #1576
Log log = _context.logManager().getLog(FortunaRandomSource.class);
log.warn("feedEntropy()", e);
} }
} }

3
history.txt
View File

@ -1,3 +1,6 @@
2015-05-31 zzz
* Fortuna: Catch AIOOBE (ticket #1576)
2015-05-30 zzz 2015-05-30 zzz
* i2ptunnel: Fix +/- variance config (ticket #1587) * i2ptunnel: Fix +/- variance config (ticket #1587)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 33; public final static long BUILD = 34;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";