Merge pull request #380 from AdrianSchneider/fixCrashOnTwoErrors

Prevent Multiple Errors from Crashing
expressjs · Dec 14, 2016 · a946f14 · a946f14
2 parents c6fee61 + 2e3d9d8
commit a946f14
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/make-middleware.js b/lib/make-middleware.js
@@ -57,6 +57,7 @@ function makeMiddleware (setup) {
     }
 
     function abortWithError (uploadError) {
+      if (errorOccured) return
       errorOccured = true
 
       pendingWrites.onceZero(function () {

diff --git a/test/error-handling.js b/test/error-handling.js
@@ -2,6 +2,7 @@
 
 var assert = require('assert')
 
+var os = require('os')
 var util = require('./_util')
 var multer = require('../')
 var stream = require('stream')
@@ -203,4 +204,20 @@ describe('Error Handling', function () {
       done()
     })
   })
+
+  it('should gracefully handle more than one error at a time', function (done) {
+    var form = new FormData()
+    var storage = multer.diskStorage({ destination: os.tmpdir() })
+    var upload = multer({ storage: storage, limits: { fileSize: 1, files: 1 } }).fields([
+      { name: 'small0', maxCount: 1 }
+    ])
+
+    form.append('small0', util.file('small0.dat'))
+    form.append('small0', util.file('small0.dat'))
+
+    util.submitForm(upload, form, function (err, req) {
+      assert.equal(err.code, 'LIMIT_FILE_SIZE')
+      done()
+    })
+  })
 })