summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 03:22:57 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 03:22:57 +0000
commit196d4a7d730eceaf2b9719a44d4c9778102e5724 (patch)
tree14019e1d6f5e01e7ec8554b379e1b61efe9b2e55 /lib
parent2d0d54f228bdb61eac1cf17d5e8c58c54858a9ae (diff)
merge revision(s) 30302:
* lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255. [ruby-core:29501] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/resolv.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 5a4275f63a..5cc03138a5 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -2066,7 +2066,11 @@ class Resolv
##
# Regular expression IPv4 addresses must match.
- Regex = /\A(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
+ Regex256 = /0
+ |1(?:[0-9][0-9]?)?
+ |2(?:[0-4][0-9]?|5[0-5]?|[6-9])?
+ |[3-9][0-9]?/x
+ Regex = /\A(#{Regex256})\.(#{Regex256})\.(#{Regex256})\.(#{Regex256})\z/
def self.create(arg)
case arg