Merge pull request mozilla#3126 from mduan/issue3118-2

yurydelendik · yurydelendik · commit 8e4d9e9aa07f · 2013-04-20T11:20:31.000-07:00
Clamp end of range request to be the length of the file
diff --git a/src/chunked_stream.js b/src/chunked_stream.js
@@ -258,7 +258,7 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
       for (var i = 0, n = groupedChunks.length; i < n; ++i) {
         var groupedChunk = groupedChunks[i];
         var begin = groupedChunk.beginChunk * this.chunkSize;
-        var end = groupedChunk.endChunk * this.chunkSize;
+        var end = Math.min(groupedChunk.endChunk * this.chunkSize, this.length);
         this.sendRequest(begin, end);
       }
 
@@ -314,7 +314,7 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
       for (var i = 0; i < groupedChunksToRequest.length; ++i) {
         var groupedChunk = groupedChunksToRequest[i];
         var begin = groupedChunk.beginChunk * this.chunkSize;
-        var end = groupedChunk.endChunk * this.chunkSize;
+        var end = Math.min(groupedChunk.endChunk * this.chunkSize, this.length);
         this.sendRequest(begin, end);
       }
     },
