Merge pull request #198 from aloisklink/limit-range-to-file-size

Limit maximum HTTP Range header to fileSize
geotiffjs · Feb 4, 2021 · e9817ff · e9817ff
2 parents f7c511f + 21c197a
commit e9817ff
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/source.js b/src/source.js
@@ -234,7 +234,13 @@ class BlockedSource {
   }
 
   async requestData(requestedOffset, requestedLength) {
-    const response = await this.retrievalFunction(requestedOffset, requestedLength);
+    let actualLengthToRequest = requestedLength;
+    if (this.fileSize !== null && requestedOffset + requestedLength > this.fileSize) {
+      // some HTTP servers (e.g. Aliyun OSS) do not support Range requests
+      // when the Range header is longer than the actual file length
+      actualLengthToRequest = this.fileSize - requestedOffset;
+    }
+    const response = await this.retrievalFunction(requestedOffset, actualLengthToRequest);
     if (!response.length) {
       response.length = response.data.byteLength;
     } else if (response.length !== response.data.byteLength) {