Fix some potential null pointer exceptions in some test cases, and a typo in a parameter name in 2 UIs.

Author: davewichers

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00028.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00029.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00030.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00031.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00032.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00033.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00034.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00035.java

@@ -45,7 +45,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		java.util.Map<String,String[]> map = request.getParameterMap();
 		String param = "";
 		if (!map.isEmpty()) {
-			param = map.get("vector")[0];
+			String[] values = map.get("vector");
+			if (values != null) param = values[0];
 		}
 
 

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00047.java

@@ -44,12 +44,15 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
 		String queryString = request.getQueryString();
 		String paramval = "vector"+"=";
-		int paramLoc = queryString.indexOf(paramval);
+		int paramLoc = -1;
+		if (queryString != null) paramLoc = queryString.indexOf(paramval);
 		if (paramLoc == -1) {
 			response.getWriter().println("getQueryString() couldn't find expected parameter '" + "vector" + "' in query string.");
 			return;
 		}
+		
 		String param = queryString.substring(paramLoc + paramval.length()); // 1st assume "vector" param is last parameter in query string.
+		// And then check to see if its in the middle of the query string and if so, trim off what comes after.
 		int ampersandLoc = queryString.indexOf("&", paramLoc);
 		if (ampersandLoc != -1) {
 			param = queryString.substring(paramLoc + paramval.length(), ampersandLoc);

src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00048.java

@@ -44,12 +44,15 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
 		String queryString = request.getQueryString();
 		String paramval = "vector"+"=";
-		int paramLoc = queryString.indexOf(paramval);
+		int paramLoc = -1;
+		if (queryString != null) paramLoc = queryString.indexOf(paramval);
 		if (paramLoc == -1) {
 			response.getWriter().println("getQueryString() couldn't find expected parameter '" + "vector" + "' in query string.");
 			return;
 		}
+		
 		String param = queryString.substring(paramLoc + paramval.length()); // 1st assume "vector" param is last parameter in query string.
+		// And then check to see if its in the middle of the query string and if so, trim off what comes after.
 		int ampersandLoc = queryString.indexOf("&", paramLoc);
 		if (ampersandLoc != -1) {
 			param = queryString.substring(paramLoc + paramval.length(), ampersandLoc);