Fix crashes on HEAD responses without Content-Length

yandex-cloud · Aug 10, 2023 · de7f9c5 · de7f9c5
1 parent 9016568
commit de7f9c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/backend_s3.go b/internal/backend_s3.go
@@ -532,7 +532,7 @@ func (s *S3Backend) HeadBlob(param *HeadBlobInput) (*HeadBlobOutput, error) {
 			Key:          &param.Key,
 			ETag:         resp.ETag,
 			LastModified: resp.LastModified,
-			Size:         uint64(*resp.ContentLength),
+			Size:         uint64(NilInt64(resp.ContentLength)),
 			StorageClass: resp.StorageClass,
 			Metadata:     metadataToLower(resp.Metadata),
 		},
@@ -907,7 +907,7 @@ func (s *S3Backend) GetBlob(param *GetBlobInput) (*GetBlobOutput, error) {
 				Key:          &param.Key,
 				ETag:         resp.ETag,
 				LastModified: resp.LastModified,
-				Size:         uint64(*resp.ContentLength),
+				Size:         uint64(NilInt64(resp.ContentLength)),
 				StorageClass: resp.StorageClass,
 				Metadata:     metadataToLower(resp.Metadata),
 			},

diff --git a/internal/utils.go b/internal/utils.go
@@ -115,6 +115,14 @@ func PTime(v time.Time) *time.Time {
 	return &v
 }
 
+func NilInt64(v *int64) int64 {
+	if v == nil {
+		return 0
+	} else {
+		return *v
+	}
+}
+
 func NilStr(v *string) string {
 	if v == nil {
 		return ""