Coerce objects created without a prototype

Objects created with Object.create(null) do not have a toString() method closes #484
validatorjs · Feb 3, 2016 · c19e016 · c19e016
1 parent a297c3d
commit c19e016
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/test/validators.js b/test/validators.js
@@ -2453,4 +2453,13 @@ describe('Validators', function () {
         test({ validator: 'isWhitelisted', args: ['abcdefghijklmnopqrstuvwxyz-'], valid: ['foo', 'foobar', 'baz-foo'],
             invalid: ['foo bar', 'fo.bar', 'türkçe'] });
     });
+
+    it('should convert non-string input', function () {
+        var empty = [undefined, null, [], NaN, Object.create(null)];
+        empty.forEach(function (item) {
+            assert.equal(validator.toString(item), '');
+            assert(validator.isNull(item));
+        });
+    });
+
 });
diff --git a/validator.js b/validator.js
@@ -127,9 +127,13 @@
     };
 
     validator.toString = function (input) {
-        if (typeof input === 'object' && input !== null && input.toString) {
-            input = input.toString();
-        } else if (input === null || typeof input === 'undefined' || (isNaN(input) && !input.length)) {
+        if (typeof input === 'object') {
+            if (input !== null && typeof input.toString === 'function') {
+                input = input.toString();
+            } else {
+                input = '';
+            }
+        } else if (typeof input === 'undefined' || (isNaN(input) && !input.length)) {
             input = '';
         }
         return '' + input;