Merge pull request #3618 from tonistiigi/gha-offset

gha: avoid range requests with too big offset
moby · Feb 11, 2023 · 31dde70 · 31dde70
2 parents ad15d56 + 488791a
commit 31dde70
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/cache/remotecache/gha/gha.go b/cache/remotecache/gha/gha.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"os"
 	"sync"
 	"time"
@@ -371,6 +372,13 @@ type readerAt struct {
 	desc ocispecs.Descriptor
 }
 
+func (r *readerAt) ReadAt(p []byte, off int64) (int, error) {
+	if off >= r.desc.Size {
+		return 0, io.EOF
+	}
+	return r.ReaderAtCloser.ReadAt(p, off)
+}
+
 func (r *readerAt) Size() int64 {
 	return r.desc.Size
 }