From 7cfc16ca364f40e521480cc12d3f0651f2807f23 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 2 Dec 2019 17:45:22 +0000
Subject: [PATCH] NDT: Prevent NPE on JSON parse of bad/empty input (ticket
 #2672)

---
 apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java b/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
index de7354717..dc05dfe12 100644
--- a/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
@@ -29,6 +29,8 @@ public class JSONUtils {
 	public static String getValueFromJsonObj(String jsonTxt, String key) {
 		JSONValue jsonParser = new JSONValue();
 		Map json = (Map)jsonParser.parse(new String(jsonTxt));
+		if (json == null)
+			return null;
 		Iterator iter = json.entrySet().iterator();
 		while(iter.hasNext()){
 			Map.Entry entry = (Map.Entry)iter.next();