fix: uniqueItemProperties with null items, closes #101

ajv-validator · Jul 6, 2019 · d30b9a3 · d30b9a3
1 parent e4312a7
commit d30b9a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -19,7 +19,7 @@ rules:
 #  no-console: [ 2, { allow: [ warn, error ] } ]
   no-console: 0
   block-scoped-var: 2
-  complexity: [ 2, 17 ]
+  complexity: [ 2, 18 ]
   curly: [ 2, multi-or-nest, consistent ]
   dot-location: [ 2, property ]
   dot-notation: 2

diff --git a/keywords/uniqueItemProperties.js b/keywords/uniqueItemProperties.js
@@ -16,7 +16,7 @@ module.exports = function defFunc(ajv) {
             if (scalar[k]) {
               var hash = {};
               for (i = data.length; i--;) {
-                if (typeof data[i] != 'object') continue;
+                if (!data[i] || typeof data[i] != 'object') continue;
                 var prop = data[i][key];
                 if (prop && typeof prop == 'object') continue;
                 if (typeof prop == 'string') prop = '"' + prop;
@@ -25,9 +25,9 @@ module.exports = function defFunc(ajv) {
               }
             } else {
               for (i = data.length; i--;) {
-                if (typeof data[i] != 'object') continue;
+                if (!data[i] || typeof data[i] != 'object') continue;
                 for (var j = i; j--;) {
-                  if (typeof data[j] == 'object' && equal(data[i][key], data[j][key]))
+                  if (data[j] && typeof data[j] == 'object' && equal(data[i][key], data[j][key]))
                     return false;
                 }
               }