This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new b26678d4ab Avoid NPE
b26678d4ab is described below
commit b26678d4abdc0c91342a20611da67186fc28fd22
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jun 22 03:08:22 2026 +0100
Avoid NPE
---
java/org/apache/catalina/valves/rewrite/RewriteValve.java | 6 ++++++
webapps/docs/changelog.xml | 3 +++
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 48e0c4eeec..28dcaa5b0a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -586,6 +586,12 @@ public class RewriteValve extends ValveBase {
// Decode then normalize
String urlStringRewriteDecoded =
URLDecoder.decode(urlStringRewriteEncoded, uriCharset);
urlStringRewriteDecoded =
RequestUtil.normalize(urlStringRewriteDecoded);
+ if (urlStringRewriteDecoded == null) {
+ // Assume bad input caused the re-write to try and
escape root
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ return;
+ }
+
request.getCoyoteRequest().decodedURI().setChars(MessageBytes.EMPTY_CHAR_ARRAY,
0, 0);
chunk =
request.getCoyoteRequest().decodedURI().getCharChunk();
if (context) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e8314f372..3c5028fdbb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,9 @@
Improve the performance of range validation for the default servlet.
(markt)
</fix>
+ <fix>
+ Avoid NPE in RewriteValve. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
