sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix #1361 (#1362)

Browse source
This commit is contained in:
Neil Alexander 2020-08-28 09:46:32 +01:00 committed by GitHub
parent 9af2f5f1f2
commit fee1c22790
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mediaapi/fileutils/fileutils.go
View file

@ -124,8 +124,13 @@ func WriteTempFile(
} }
}() }()
// The amount of data read is limited to maxFileSizeBytes. At this point, if there is more data it will be truncated. // If the max_file_size_bytes configuration option is set to a positive
limitedReader := io.LimitReader(reqReader, int64(maxFileSizeBytes)) // number then limit the upload to that size. Otherwise, just read the
// whole file.
limitedReader := reqReader
if maxFileSizeBytes > 0 {
limitedReader = io.LimitReader(reqReader, int64(maxFileSizeBytes))
}
// Hash the file data. The hash will be returned. The hash is useful as a // Hash the file data. The hash will be returned. The hash is useful as a
// method of deduplicating files to save storage, as well as a way to conduct // method of deduplicating files to save storage, as well as a way to conduct
// integrity checks on the file data in the repository. // integrity checks on the file data in the repository.