Skip to content

Fix race condition in getFileIDs that crashes Node.js process on multi-file uploads #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jnavarrete-ep wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −5
Open

Fix race condition in getFileIDs that crashes Node.js process on multi-file uploads #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/SendSafely.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2899,6 +2899,13 @@ function EncryptAndUploadFile (eventHandler, request) {
let files = [];
myself.addEncryptionKey(packageId, serverSecret, keyCode);
function handleResponse(index, parts, files, fileUtil) {
if (files[index] === undefined) {
myself.eventHandler.raise(myself.SERVER_ERROR_EVENT, {
error: 'INTERNAL_ERROR',
message: 'getFileIDs: file at index ' + index + ' is undefined'
});
return;
}
var serverFilename = (files[index].name === undefined) ? myself.defaultFileName : files[index].name;
myself.responseParser.processAjaxDataRaw(myself.createFileID(packageId, directoryId, files[index], serverFilename, parts, uploadType, myself.async), function (resp) {
if(resp.response === "SUCCESS") {
Expand Down Expand Up @@ -2953,7 +2960,7 @@ function EncryptAndUploadFile (eventHandler, request) {
}

let _loop = function _loop(i, _p) {
_p = _p.then(function (_) {
return _p.then(function (_) {
return new Promise(function (resolve) {
let f = filesPath[i];

Expand All @@ -2968,18 +2975,18 @@ function EncryptAndUploadFile (eventHandler, request) {
} else {
let fileUtil = new FileUtil({filePath: f, callback: function(){}});
fileUtil.init().then(function(file) {
files.push(file);
files[i] = file;
handleResponse(i, file.totalParts, files, fileUtil);
resolve();
});
}
});
});
p = _p;
};

for (let i = 0, p = Promise.resolve(); i < filesPath.length; i++) {
_loop(i, p);
let p = Promise.resolve();
for (let i = 0; i < filesPath.length; i++) {
p = _loop(i, p);
}
};

Expand Down