Avoid NPE

k-tamura · Dec 23, 2019 · beec2ec · beec2ec
1 parent ef48899
commit beec2ec
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/org/t246osslab/easybuggy4sb/vulnerabilities/VulnerableOIDCRPController.java b/src/main/java/org/t246osslab/easybuggy4sb/vulnerabilities/VulnerableOIDCRPController.java
@@ -294,9 +294,11 @@ private void changeNextPageToUserInfo(ModelAndView mav, Locale locale, Map<?, ?>
 			Map<?, ?> fromJson = new Gson().fromJson(e.getContent(), Map.class);
 			if (e.getStatusCode() == 401 && fromJson != null && "invalid_token".equals(fromJson.get("error"))) {
 				TokenResponse tokenRes = refreshTokens((String) ses.getAttribute("refreshToken"));
-				ses.setAttribute("accessToken", tokenRes.getAccessToken());
-				ses.setAttribute("refreshToken", tokenRes.getRefreshToken());
-				return getUserInfo(ses);
+				if (tokenRes != null) {
+					ses.setAttribute("accessToken", tokenRes.getAccessToken());
+					ses.setAttribute("refreshToken", tokenRes.getRefreshToken());
+					return getUserInfo(ses);
+				}
 			} else {
 				log.error("Userinfo request failed.", e);
 			}