fix(model): throw error when passing non-object to create()

Fix #2037
Automattic · Dec 4, 2017 · d90100e · d90100e
1 parent d0d2d5f
commit d90100e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/document.js b/lib/document.js
@@ -7,6 +7,7 @@ var MongooseError = require('./error');
 var MixedSchema = require('./schema/mixed');
 var Schema = require('./schema');
 var ObjectExpectedError = require('./error/objectExpected');
+var ObjectParameterError = require('./error/objectParameter');
 var StrictModeError = require('./error/strict');
 var ValidatorError = require('./schematype').ValidatorError;
 var VirtualType = require('./virtualtype');
@@ -48,6 +49,10 @@ function Document(obj, fields, skipId, options) {
   this.errors = undefined;
   this.$__.$options = options || {};
 
+  if (obj != null && typeof obj !== 'object') {
+    throw new ObjectParameterError(obj, 'obj', 'Document');
+  }
+
   var schema = this.schema;
 
   if (typeof fields === 'boolean') {

diff --git a/lib/model.js b/lib/model.js
@@ -2043,7 +2043,7 @@ Model.create = function create(doc, callback) {
         var Model = _this.discriminators && doc[discriminatorKey] ?
           _this.discriminators[doc[discriminatorKey]] :
           _this;
-        var toSave = doc instanceof Model ? doc : new Model(doc);
+        var toSave = doc;
         var callbackWrapper = function(error, doc) {
           if (error) {
             if (!firstError) {
@@ -2054,6 +2054,14 @@ Model.create = function create(doc, callback) {
           callback(null, { doc: doc });
         };
 
+        if (!(toSave instanceof Model)) {
+          try {
+            toSave = new Model(toSave);
+          } catch (error) {
+            return callbackWrapper(error);
+          }
+        }
+
         // Hack to avoid getting a promise because of
         // $__registerHooksFromSchema
         if (toSave.$__original_save) {