qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-26 05:36:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] fix file range length calculation being off by 1 (#1448)

Browse source 
* small formatting change

* fix range handling new length calculation

---------

Signed-off-by: kim <grufwub@gmail.com>
This commit is contained in:
kim 2023-02-07 08:51:15 +00:00 committed by GitHub
parent 6a6647d68b
commit ac2bdbbc62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/api/fileserver/servefile.go
View file

@ -218,8 +218,9 @@ func serveFileRange(rw http.ResponseWriter, src io.Reader, rng string, size int6
return return
} }
// Determine content len // Determine new content length
length := end - start // after slicing to given range.
length := end - start + 1
if end < size-1 { if end < size-1 {
// Range end < file end, limit the reader // Range end < file end, limit the reader

4
internal/processing/media/delete.go
View file

@ -39,11 +39,9 @@ func (p *processor) Delete(ctx context.Context, mediaAttachmentID string) gtserr
} }
// delete the attachment // delete the attachment
if err := p.db.DeleteByID(ctx, mediaAttachmentID, attachment); err != nil { if err := p.db.DeleteByID(ctx, mediaAttachmentID, attachment); err != nil && !errors.Is(err, db.ErrNoEntries) {
if err != db.ErrNoEntries {
errs = append(errs, fmt.Sprintf("remove attachment: %s", err)) errs = append(errs, fmt.Sprintf("remove attachment: %s", err))
} }
}
if len(errs) != 0 { if len(errs) != 0 {
return gtserror.NewErrorInternalError(fmt.Errorf("Delete: one or more errors removing attachment with id %s: %s", mediaAttachmentID, strings.Join(errs, "; "))) return gtserror.NewErrorInternalError(fmt.Errorf("Delete: one or more errors removing attachment with id %s: %s", mediaAttachmentID, strings.Join(errs, "; ")))