diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-24 15:49:21 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-24 15:49:21 +0000 |
| commit | e097b9b41b2e67000c80e34c349b197ef038a2a5 (patch) | |
| tree | b3ee040e4ef33f831fdf1b91ec5f96d4017b02a2 /lib | |
| parent | 66b2b435bfb30a287b2b11f1a77a20bb59a4b026 (diff) | |
merge revision(s) 52244: [Backport #11513]
* lib/ipaddr.rb, test/test_ipaddr.rb: Reject invalid address contained
EOL string. Patch by @kachick [fix GH-942][Bug #11513]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ipaddr.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 4b5f784ae0..b0df4d3e6f 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -410,7 +410,7 @@ class IPAddr # Set current netmask to given mask. def mask!(mask) if mask.kind_of?(String) - if mask =~ /^\d+$/ + if mask =~ /\A\d+\z/ prefixlen = mask.to_i else m = IPAddr.new(mask) @@ -478,7 +478,7 @@ class IPAddr end end prefix, prefixlen = addr.split('/') - if prefix =~ /^\[(.*)\]$/i + if prefix =~ /\A\[(.*)\]\z/i prefix = $1 family = Socket::AF_INET6 end |