diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java index 340b836a4..9688e8764 100644 --- a/core/java/src/net/i2p/util/FortunaRandomSource.java +++ b/core/java/src/net/i2p/util/FortunaRandomSource.java @@ -262,8 +262,14 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste /** reseed the fortuna */ @Override public void feedEntropy(String source, byte[] data, int offset, int len) { - synchronized(_fortuna) { - _fortuna.addRandomBytes(data, offset, len); + try { + 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); } } diff --git a/history.txt b/history.txt index 878f30950..832911645 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-05-31 zzz + * Fortuna: Catch AIOOBE (ticket #1576) + 2015-05-30 zzz * i2ptunnel: Fix +/- variance config (ticket #1587) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fc03273f8..b76ab6863 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 33; + public final static long BUILD = 34; /** for example "-test" */ public final static String EXTRA = "-rc";