markt-asf commented on code in PR #782:
URL: https://github.com/apache/tomcat/pull/782#discussion_r1854564015
##########
java/org/apache/catalina/servlets/DefaultServlet.java:
##########
@@ -1231,10 +1231,25 @@ private static boolean validate(ContentRange range) {
(range.getEnd() >= 0) && (range.getStart() <= range.getEnd())
&& (range.getLength() > 0);
}
- private static boolean validate(Ranges.Entry range, long length) {
- long start = getStart(range, length);
- long end = getEnd(range, length);
- return (start >= 0) && (end >= 0) && (start <= end);
+ private static boolean validate(Ranges ranges, long length) {
+ List<long[]> rangeContext = new ArrayList<long[]>();
+ for (Ranges.Entry range : ranges.getEntries()) {
+ long start = getStart(range, length);
+ long end = getEnd(range, length);
+ if (start < 0 || start > end) {
+ // illegal entry
+ return false;
+ }
+ // see rfc9110 #status.416
+ for (long[] e : rangeContext) {
+ if (Long.min(end, e[1]) - Long.max(start, e[0]) >= 0) {
Review Comment:
Simplify? Maybe `Long.min(...) < Long.max(...)`?
##########
java/org/apache/catalina/servlets/DefaultServlet.java:
##########
@@ -1231,10 +1231,25 @@ private static boolean validate(ContentRange range) {
(range.getEnd() >= 0) && (range.getStart() <= range.getEnd())
&& (range.getLength() > 0);
}
- private static boolean validate(Ranges.Entry range, long length) {
- long start = getStart(range, length);
- long end = getEnd(range, length);
- return (start >= 0) && (end >= 0) && (start <= end);
+ private static boolean validate(Ranges ranges, long length) {
+ List<long[]> rangeContext = new ArrayList<long[]>();
+ for (Ranges.Entry range : ranges.getEntries()) {
+ long start = getStart(range, length);
+ long end = getEnd(range, length);
+ if (start < 0 || start > end) {
Review Comment:
I like this optimisation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
