Skip to content

Commit

Permalink
Fixed issue with closing files in fPutObject() function (#1112)
Browse files Browse the repository at this point in the history
  • Loading branch information
meefik committed Apr 26, 2023
1 parent 75ed013 commit 832ac71
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/main/minio.js
Original file line number Diff line number Diff line change
Expand Up @@ -1034,13 +1034,15 @@ export class Client {
cb => fs.stat(filePath, cb),
(stats, cb) => {
size = stats.size
var stream
var cbTriggered = false
var origCb = cb
cb = function () {
if (cbTriggered) {
return
}
cbTriggered = true
if (stream) stream.destroy()
return origCb.apply(this, arguments)
}
if (size > this.maxObjectSize) {
Expand All @@ -1060,7 +1062,7 @@ export class Client {
.on('data', data => {
var md5sum = data.md5sum
var sha256sum = data.sha256sum
var stream = fs.createReadStream(filePath, options)
stream = fs.createReadStream(filePath, options)
uploader(stream, size, sha256sum, md5sum, (err, objInfo) => {
callback(err, objInfo)
cb(true)
Expand Down Expand Up @@ -1095,13 +1097,15 @@ export class Client {
async.whilst(
cb => { cb(null, uploadedSize < size) },
cb => {
var stream
var cbTriggered = false
var origCb = cb
cb = function () {
if (cbTriggered) {
return
}
cbTriggered = true
if (stream) stream.destroy()
return origCb.apply(this, arguments)
}
var part = parts[partNumber]
Expand All @@ -1126,7 +1130,7 @@ export class Client {
return cb()
}
// part is not uploaded yet, or md5 mismatch
var stream = fs.createReadStream(filePath, options)
stream = fs.createReadStream(filePath, options)
uploader(uploadId, partNumber, stream, length,
data.sha256sum, data.md5sum, (e, objInfo) => {
if (e) return cb(e)
Expand Down

0 comments on commit 832ac71

Please sign in to comment.