Repository: struts Updated Branches: refs/heads/master 7e4d1b45e -> f78d90ee2
WW-4726 Fixes wrong value type used to limit upload Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f78d90ee Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f78d90ee Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f78d90ee Branch: refs/heads/master Commit: f78d90ee22eed1e898cebefa4565687919b09c30 Parents: 7e4d1b4 Author: Lukasz Lenart <[email protected]> Authored: Tue Dec 20 19:50:43 2016 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Tue Dec 20 19:50:43 2016 +0100 ---------------------------------------------------------------------- .../struts2/dispatcher/multipart/AbstractMultiPartRequest.java | 4 ++-- .../struts2/dispatcher/multipart/PellMultiPartRequest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/f78d90ee/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java ---------------------------------------------------------------------- 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 index a8037ed..6c3f1f3 100644 --- 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 abstract class AbstractMultiPartRequest implements MultiPartRequest { @Inject(StrutsConstants.STRUTS_MULTIPART_MAXSIZE) public void setMaxSize(String maxSize) { this.maxSizeProvided = true; - this.maxSize = Integer.parseInt(maxSize); + this.maxSize = Long.parseLong(maxSize); } /** http://git-wip-us.apache.org/repos/asf/struts/blob/f78d90ee/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java ---------------------------------------------------------------------- diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java index 18bce32..3c733c6 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java +++ b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java @@ -58,7 +58,8 @@ public class PellMultiPartRequest extends AbstractMultiPartRequest { 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); }
