Last bugfix was not a bug fix.

Reverted isIPRange back to the previous state. j
validatorjs · Jun 7, 2018 · f374563 · f374563
1 parent 192b06f
commit f374563
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/lib/isIPRange.js b/lib/isIPRange.js
@@ -23,16 +23,16 @@ var subnetMaybe = /^\d{1,2}$/;
 function isIPRange(str) {
   (0, _assertString2.default)(str);
 
-  var rangeParts = str.split('/');
+  var _str$split = str.split('/'),
+      _str$split2 = _slicedToArray(_str$split, 3),
+      ip = _str$split2[0],
+      subnet = _str$split2[1],
+      err = _str$split2[2];
 
-  if (rangeParts.length !== 2) {
+  if (typeof err !== 'undefined') {
     return false;
   }
 
-  var _rangeParts = _slicedToArray(rangeParts, 2),
-      ip = _rangeParts[0],
-      subnet = _rangeParts[1];
-
   if (!subnetMaybe.test(subnet)) {
     return false;
   }

diff --git a/src/lib/isIPRange.js b/src/lib/isIPRange.js
@@ -7,10 +7,6 @@ export default function isIPRange(str) {
   assertString(str);
   const [ip, subnet, err] = str.split('/');
 
-  if (typeof subnet === 'undefined') {
-    return false;
-  }
-
   if (typeof err !== 'undefined') {
     return false;
   }
@@ -24,5 +20,5 @@ export default function isIPRange(str) {
     return false;
   }
 
-  return isIP(ip) && subnet <= 32 && subnet >= 0;
+  return isIP(ip, 4) && subnet <= 32 && subnet >= 0;
 }
diff --git a/validator.js b/validator.js
@@ -541,16 +541,16 @@ var subnetMaybe = /^\d{1,2}$/;
 function isIPRange(str) {
   assertString(str);
 
-  var rangeParts = str.split('/');
+  var _str$split = str.split('/'),
+      _str$split2 = slicedToArray(_str$split, 3),
+      ip = _str$split2[0],
+      subnet = _str$split2[1],
+      err = _str$split2[2];
 
-  if (rangeParts.length !== 2) {
+  if (typeof err !== 'undefined') {
     return false;
   }
 
-  var _rangeParts = slicedToArray(rangeParts, 2),
-      ip = _rangeParts[0],
-      subnet = _rangeParts[1];
-
   if (!subnetMaybe.test(subnet)) {
     return false;
   }