github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-09 22:45:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check if streams are already destroyed before destroying

Browse source
This commit is contained in:
Simon Detheridge 2020-03-31 11:07:31 +01:00
parent 5fadafaf96
commit f440cec8ec
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
services/filestore/app/js/FileController.js
View file

@ -61,18 +61,18 @@ function getFile(req, res, next) {
}
pipeline(fileStream, res, err => {
if (err) {
if (!fileStream.destroyed) {
fileStream.destroy()
if (err.code === 'ERR_STREAM_PREMATURE_CLOSE') {
res.end()
} else {
next(
new Errors.ReadError({
message: 'error transferring stream',
info: { bucket, key, format, style }
}).withCause(err)
)
}
}
if (err && err.code === 'ERR_STREAM_PREMATURE_CLOSE') {
res.end()
} else if (err) {
next(
new Errors.ReadError({
message: 'error transferring stream',
info: { bucket, key, format, style }
}).withCause(err)
)
}
})
})

4
services/filestore/app/js/PersistorHelper.js
View file

@ -114,7 +114,9 @@ function getReadyPipeline(...streams) {
}
if (err) {
for (const stream of streams) {
stream.destroy()
if (!stream.destroyed) {
stream.destroy()
}
}
}
}