issue google#1655: prevent NullPointerException if contextPath is null

kurtseebauer · Nov 17, 2022 · 45c1b69 · 45c1b69
1 parent 7e74007
commit 45c1b69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
@@ -212,7 +212,9 @@ public String getPathInfo() {
               String servletPath = getServletPath();
               int servletPathLength = servletPath.length();
               String requestUri = getRequestURI();
-              pathInfo = requestUri.substring(getContextPath().length()).replaceAll("[/]{2,}", "/");
+                String contextPath = getContextPath();
+                int contextPathLength = contextPath != null ? contextPath.length() : 0;
+                pathInfo = requestUri.substring(contextPathLength).replaceAll("[/]{2,}", "/");
               // See: https://github.com/google/guice/issues/372
               if (pathInfo.startsWith(servletPath)) {
                 pathInfo = pathInfo.substring(servletPathLength);

diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
@@ -113,6 +113,7 @@ protected void service(
   // Data-driven test.
   public final void testPathInfoWithServletStyleMatching() throws IOException, ServletException {
     pathInfoWithServletStyleMatching("/path/index.html", "/path", "/*", "/index.html", "");
+    pathInfoWithServletStyleMatching("/index.html", null, "/*", "/index.html", "");
     pathInfoWithServletStyleMatching(
         "/path//hulaboo///index.html", "/path", "/*", "/hulaboo/index.html", "");
     pathInfoWithServletStyleMatching("/path/", "/path", "/*", "/", "");