From 2e3f5d0de9269523e86853ea3a6b0774bc4964ff Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 12 Mar 2016 13:55:03 +0000
Subject: [PATCH] UPnP: Fix NPE in HTML output on /peers (ticket #1779)
---
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
router/java/src/net/i2p/router/transport/UPnP.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 895e8eb464..46b0184db4 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 = 10;
+ public final static long BUILD = 11;
/** for example "-test" */
public final static String EXTRA = "-rc";
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index 58cc32c75b..66b0c106de 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -544,7 +544,10 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
_lastService = serv;
_lastArgumentList = getIP.getOutputArgumentList();
}
- String rv = _lastArgumentList.getArgument(arg).getValue();
+ Argument a = _lastArgumentList.getArgument(arg);
+ if (a == null)
+ return "";
+ String rv = a.getValue();
return DataHelper.escapeHTML(rv);
}
}
--
GitLab