Short-circuit IPv6 validity check with string.indexOf(":") == -1.

Fixes #27.
whitequark · Oct 17, 2015 · 500dca0 · 500dca0
1 parent 51abe4e
commit 500dca0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/ipaddr.min.js b/ipaddr.min.js
diff --git a/lib/ipaddr.js b/lib/ipaddr.js
diff --git a/src/ipaddr.coffee b/src/ipaddr.coffee
@@ -321,7 +321,19 @@ ipaddr.IPv4.isIPv4 = ipaddr.IPv6.isIPv6 = (string) ->
   return @parser(string) != null
 
 # Checks if a given string is a valid IPv4/IPv6 address.
-ipaddr.IPv4.isValid = ipaddr.IPv6.isValid = (string) ->
+ipaddr.IPv4.isValid = (string) ->
+  try
+    new this(@parser(string))
+    return true
+  catch e
+    return false
+
+ipaddr.IPv6.isValid = (string) ->
+  # Since IPv6.isValid is always called first, this shortcut
+  # provides a substantial performance gain.
+  if string.indexOf(":") == -1
+    return false
+
   try
     new this(@parser(string))
     return true