]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Ignore Range headers with unidentifiable byte-range values
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 26 Aug 2014 16:27:23 +0000 (09:27 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 26 Aug 2014 16:27:23 +0000 (09:27 -0700)
If squid is unable to determine the byte value for ranges, treat the
header as invalid.

src/HttpHdrRange.cc

index a47fdae4a29a2e5d2d49dcee0d58e330cdfb562d..6aeb93b0af30b5ca471be869bb41182f8ea46b15 100644 (file)
@@ -92,7 +92,7 @@ HttpHdrRangeSpec::parseInit(const char *field, int flen)
 
     /* is it a suffix-byte-range-spec ? */
     if (*field == '-') {
-        if (!httpHeaderParseOffset(field + 1, &length))
+        if (!httpHeaderParseOffset(field + 1, &length) || !known_spec(length))
             return false;
     } else
         /* must have a '-' somewhere in _this_ field */
@@ -100,7 +100,7 @@ HttpHdrRangeSpec::parseInit(const char *field, int flen)
             debugs(64, 2, "invalid (missing '-') range-spec near: '" << field << "'");
             return false;
         } else {
-            if (!httpHeaderParseOffset(field, &offset))
+            if (!httpHeaderParseOffset(field, &offset) || !known_spec(offset))
                 return false;
 
             ++p;
@@ -109,7 +109,7 @@ HttpHdrRangeSpec::parseInit(const char *field, int flen)
             if (p - field < flen) {
                 int64_t last_pos;
 
-                if (!httpHeaderParseOffset(p, &last_pos))
+                if (!httpHeaderParseOffset(p, &last_pos) || !known_spec(last_pos))
                     return false;
 
                 // RFC 2616 s14.35.1 MUST: last-byte-pos >= first-byte-pos