[tomcat] 07/08: Handle exception triggered by invalid parameters during access logging

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit d6f56761693b06632f4bdd27d7c3010e3665bfbc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Aug 20 13:05:07 2023 +0100

    Handle exception triggered by invalid parameters during access logging
---
 java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java 
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index c9cba36f83..ad07cf6339 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -361,7 +361,13 @@ public class ExtendedAccessLogValve extends AccessLogValve 
{
 
         @Override
         public void addElement(CharArrayWriter buf, Date date, Request 
request, Response response, long time) {
-            buf.append(wrap(urlEncode(request.getParameter(parameter))));
+            String parameterValue;
+            try {
+                parameterValue = request.getParameter(parameter);
+            } catch (IllegalStateException ise) {
+                parameterValue = null;
+            }
+            buf.append(wrap(urlEncode(parameterValue)));
         }
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org