summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-03 05:35:56 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-03 05:35:56 +0000
commit6249e5f7742f88c7716330b0856da81cd6da74d9 (patch)
tree78ca0e89f89f7e900c92bd60934ee81d99741cca /lib
parent8d6d95d3a1717af15665d0e0ee7578ed2d615268 (diff)
merge revision(s) 19774:
* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558) [ruby-dev:36631] * test/net/pop/test_pop.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/pop.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 82cc9a747b..9a6a25266f 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -871,7 +871,7 @@ module Net
@socket = sock
@error_occured = false
res = check_response(critical { recv_response() })
- @apop_stamp = res.slice(/<.+>/)
+ @apop_stamp = res.slice(/<[!-~]+@[!-~]+>/)
end
def inspect