WW-4726 Fixes wrong value type used to limit upload

dut3062796s · Dec 20, 2016 · f78d90e · f78d90e
1 parent 7e4d1b4
commit f78d90e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@ -33,7 +33,7 @@ public abstract class AbstractMultiPartRequest implements MultiPartRequest {
     /**
      * Specifies the maximum size of the entire request.
      */
-    protected int maxSize;
+    protected long maxSize;
     protected boolean maxSizeProvided;
 
     /**
@@ -67,7 +67,7 @@ public void setDefaultEncoding(String enc) {
     @Inject(StrutsConstants.STRUTS_MULTIPART_MAXSIZE)
     public void setMaxSize(String maxSize) {
         this.maxSizeProvided = true;
-        this.maxSize = Integer.parseInt(maxSize);
+        this.maxSize = Long.parseLong(maxSize);
     }
 
     /**

diff --git a/...multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/...multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
@@ -58,7 +58,8 @@ public void parse(HttpServletRequest servletRequest, String saveDir) throws IOEx
         synchronized (this) {
             setEncoding();
             if (maxSizeProvided){
-            	multi = new ServletMultipartRequest(servletRequest, saveDir, maxSize);
+                int intMaxSize = (maxSize >= Integer.MAX_VALUE ? Integer.MAX_VALUE : Long.valueOf(maxSize).intValue());
+            	multi = new ServletMultipartRequest(servletRequest, saveDir, intMaxSize);
             }else{
             	multi = new ServletMultipartRequest(servletRequest, saveDir);
             }