Align size tracking for multipart requests with FileUpload's use of long

markt-asf · markt-asf · commit 927d66fbc294 · 2025-07-01T20:25:40.000+01:00
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
@@ -2715,23 +2715,23 @@ private void parseParts(boolean explicit) {
             try {
                 List<FileItem> items = upload.parseRequest(new ServletRequestContext(this));
                 int maxPostSize = getConnector().getMaxPostSize();
-                int postSize = 0;
+                long postSize = 0;
                 Charset charset = getCharset();
                 for (FileItem item : items) {
                     ApplicationPart part = new ApplicationPart(item, location);
-                    parts.add(part);
                     if (part.getSubmittedFileName() == null) {
                         String name = part.getName();
                         if (maxPostSize >= 0) {
                             // Have to calculate equivalent size. Not completely
                             // accurate but close enough.
-                            postSize += name.getBytes(charset).length;
+                            // Name
+                            postSize = Math.addExact(postSize, name.getBytes(charset).length);
                             // Equals sign
-                            postSize++;
+                            postSize = Math.addExact(postSize, 1);
                             // Value length
-                            postSize += part.getSize();
+                            postSize = Math.addExact(postSize, part.getSize());
                             // Value separator
-                            postSize++;
+                            postSize = Math.addExact(postSize, 1);
                             if (postSize > maxPostSize) {
                                 parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
                                 throw new IllegalStateException(sm.getString("coyoteRequest.maxPostSizeExceeded"));
@@ -2748,6 +2748,7 @@ private void parseParts(boolean explicit) {
                         // Adjust the limit to account for a file part which is not added to the parameter map.
                         maxParameterCount--;
                     }
+                    parts.add(part);
                 }
 
                 success = true;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
         multipart uploads with non-file parts when the parts were processed
         before query string parameters. (markt)
       </fix>
+      <fix>
+        Align size tracking for multipart requests with FileUpload's use of
+        <code>long</code>. (schultz)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
