Skip to content

Fix logical AND to logical OR for file uploads to prevent accidental too... #361

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.

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

Merged
merged 1 commit into from
Oct 15, 2014
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion controllers/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ exports.uploadScript = function (aReq, aRes, aNext) {
var failUrl = '/user/add/' + (isLib ? 'lib' : 'scripts');

// Reject non-js and huge files
if (script.type !== 'application/javascript' &&
if (script.type !== 'application/javascript' ||
script.size > settings.maximum_upload_script_size) {
return aRes.redirect(failUrl);
}
Expand Down