Changeset 0d5cf46

Timestamp:

Aug 9, 2016 5:27:54 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

b21b953

Parents:

9c0ae146

Message:

Console: Fix UPnP NPE on /peers (ticket #1830)

Files:

• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)
• router/java/src/net/i2p/router/transport/UPnP.java (modified) (3 diffs)

history.txt

@@ +1 @@
+2016-08-09 zzz
+ * Console: Fix UPnP NPE on /peers (ticket #1830)
+
 2016-08-02 zzz
  * i2psnark: Fix SIOOBE on bad announce URL (ticket #1823)

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */

router/java/src/net/i2p/router/transport/UPnP.java

@@ -421 +421 @@
                         return null;
 
-                String rv = (getIP.getOutputArgumentList().getArgument("NewExternalIPAddress")).getValue();
+                Argument a = getIP.getOutputArgumentList().getArgument("NewExternalIPAddress");
+                if (a == null)
+                        return null;
+                String rv = a.getValue();
                 // I2P some devices return 0.0.0.0 when not connected
                 if ("0.0.0.0".equals(rv) || rv == null || rv.length() <= 0)
@@ -443 +446 @@
                         return -1;
 
+                Argument a = getIP.getOutputArgumentList().getArgument("NewUpstreamMaxBitRate");
+                if (a == null)
+                        return -1;
                 try {
-                    return Integer.parseInt(getIP.getOutputArgumentList().getArgument("NewUpstreamMaxBitRate").getValue());
+                    return Integer.parseInt(a.getValue());
                 } catch (NumberFormatException nfe) {
                     return -1;
@@ -465 +471 @@
                         return -1;
 
+                Argument a = getIP.getOutputArgumentList().getArgument("NewDownstreamMaxBitRate");
+                if (a == null)
+                        return -1;
                 try {
-                    return Integer.parseInt(getIP.getOutputArgumentList().getArgument("NewDownstreamMaxBitRate").getValue());
+                    return Integer.parseInt(a.getValue());
                 } catch (NumberFormatException nfe) {
                     return -1;