Ratchet: Fix NPE ratcheting IB NSR tagset

history.txt

+2020-05-01 zzz
+ * Ratchet: Fix NPE ratcheting IB NSR tagset
+
 2020-04-30 zzz
+ * i2ptunnel: Prevent changing enc type on running tunnel
  * Ratchet: Error handling fixes
  * Streaming: Westwood+ congestion control (ticket #2719)

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 = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";

router/java/src/net/i2p/router/crypto/ratchet/RatchetTagSet.java

@@ -450,9 +450,12 @@ class RatchetTagSet implements TagSetHandle {
             int toTrim = 0;
             int tagnum;
             while ((tagnum = _sessionTags.keyAt(toTrim)) < tooOld) {
-                int kidx = _sessionKeys.indexOfKey(tagnum);
-                if (kidx >= 0)
-                    _sessionKeys.removeAt(kidx);
+                if (_sessionKeys != null) {
+                    // only for ES tagsets
+                    int kidx = _sessionKeys.indexOfKey(tagnum);
+                    if (kidx >= 0)
+                        _sessionKeys.removeAt(kidx);
+                }
                 if (_lsnr != null)
                     _lsnr.expireTag(_sessionTags.valueAt(toTrim), this);
                 toTrim++;