[tomcat] branch 8.5.x updated: Cleanup

[remm]

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

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 6dd84aa08d Cleanup
6dd84aa08d is described below

commit 6dd84aa08dff75e2251c478455244604b49ac32f
Author: remm <r...@apache.org>
AuthorDate: Mon Sep 11 16:11:25 2023 +0200

    Cleanup
    
    Found by coverity.
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 419d5c17a0..47fa7ce8be 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1317,7 +1317,10 @@ public class DefaultServlet extends HttpServlet {
         is.reset();
         if (stripBom) {
             while (skip-- > 0) {
-                is.read();
+                if (is.read() < 0) {
+                    // Ignore since included
+                    break;
+                }
             }
         }
     }


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