diff options
| -rw-r--r-- | lib/ipaddr.rb | 5 | ||||
| -rw-r--r-- | test/test_ipaddr.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 6385d69c6a..6c0ded2a77 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -495,8 +495,11 @@ class IPAddr def mask!(mask) case mask when String - if mask =~ /\A\d+\z/ + case mask + when /\A(0|[1-9]+\d*)\z/ prefixlen = mask.to_i + when /\A\d+\z/ + raise InvalidPrefixError, "leading zeros in prefix" else m = IPAddr.new(mask) if m.family != @family diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb index 3c3d70e3f2..2b6e5c7524 100644 --- a/test/test_ipaddr.rb +++ b/test/test_ipaddr.rb @@ -92,6 +92,8 @@ class TC_IPAddr < Test::Unit::TestCase assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("[2001:200:300::]\nINVALID") } assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32\nINVALID") } assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32/20") } + assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/032") } + assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/0128") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/255.255.255.0") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/129") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/33") } |