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

UPnP: Fix NPE in HTML output on /peers (ticket #1779)

Browse Source
This commit is contained in:
zzz
2016-03-12 13:55:03 +00:00
parent dc36de667d
commit 2e3f5d0de9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 = 10; public final static long BUILD = 11;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";

5
router/java/src/net/i2p/router/transport/UPnP.java
View File

@@ -544,7 +544,10 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
_lastService = serv; _lastService = serv;
_lastArgumentList = getIP.getOutputArgumentList(); _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); return DataHelper.escapeHTML(rv);
} }
} }