diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-29 13:55:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-29 13:55:27 +0000 |
| commit | 839ee606876c71d6ca2fadf13ee4d0dbfebbf25c (patch) | |
| tree | 011b86c0b8ba942688fb98a34735c4dced7c7ff6 | |
| parent | f0a2b08b4461f9c6add51738679ec8e06e3e0fae (diff) | |
* lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
by nested repeat operators. [ruby-core:33464]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/uri/common.rb | 2 | ||||
| -rw-r--r-- | test/uri/test_common.rb | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Nov 29 22:55:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion + by nested repeat operators. [ruby-core:33464] + Mon Nov 29 22:53:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/Makefile.sub (scriptbin.mk): fix generated rules. diff --git a/lib/uri/common.rb b/lib/uri/common.rb index e6f189bdbe..8cd2f2b069 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -807,7 +807,7 @@ module URI end.join('&') end - WFKV_ = '(?:%\h\h|[^%#=;&]+)' # :nodoc: + WFKV_ = '(?:%\h\h|[^%#=;&])' # :nodoc: # Decode URL-encoded form data from given +str+. # diff --git a/test/uri/test_common.rb b/test/uri/test_common.rb index 410f46bd0b..2c0bc79cd5 100644 --- a/test/uri/test_common.rb +++ b/test/uri/test_common.rb @@ -110,6 +110,8 @@ class TestCommon < Test::Unit::TestCase assert_raise(ArgumentError){URI.decode_www_form("a=1&%=2")} assert_raise(ArgumentError){URI.decode_www_form("a=1&b=%")} assert_raise(ArgumentError){URI.decode_www_form("a&b")} + bug4098 = '[ruby-core:33464]' + assert_raise(ArgumentError, bug4098){URI.decode_www_form("a=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&b")} end end |