kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/uri/common.rb: avoid race condition. fixes #4572

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-04-12 10:20:50 +00:00
parent dd11a58be3
commit 8553b70a39
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Apr 12 19:19:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/common.rb: avoid race condition. fixes #4572
Tue Apr 12 18:07:13 2011 TAKAO Kouji <kouji@takao7.net> Tue Apr 12 18:07:13 2011 TAKAO Kouji <kouji@takao7.net>
* ext/readline/extconf.rb: --disable-libedit to disable * ext/readline/extconf.rb: --disable-libedit to disable

24
lib/uri/common.rb
View file

@ -743,11 +743,16 @@ module URI
# See URI.decode_www_form_component, URI.encode_www_form # See URI.decode_www_form_component, URI.encode_www_form
def self.encode_www_form_component(str) def self.encode_www_form_component(str)
if TBLENCWWWCOMP_.empty? if TBLENCWWWCOMP_.empty?
tbl = {}
256.times do |i| 256.times do |i|
TBLENCWWWCOMP_[i.chr] = '%%%02X' % i tbl[i.chr] = '%%%02X' % i
end end
TBLENCWWWCOMP_[' '] = '+' tbl[' '] = '+'
begin
TBLENCWWWCOMP_.replace(tbl)
TBLENCWWWCOMP_.freeze TBLENCWWWCOMP_.freeze
rescue
end
end end
str = str.to_s str = str.to_s
if HTML5ASCIIINCOMPAT.include?(str.encoding) if HTML5ASCIIINCOMPAT.include?(str.encoding)
@ -767,15 +772,20 @@ module URI
# See URI.encode_www_form_component, URI.decode_www_form # See URI.encode_www_form_component, URI.decode_www_form
def self.decode_www_form_component(str, enc=Encoding::UTF_8) def self.decode_www_form_component(str, enc=Encoding::UTF_8)
if TBLDECWWWCOMP_.empty? if TBLDECWWWCOMP_.empty?
tbl = {}
256.times do |i| 256.times do |i|
h, l = i>>4, i&15 h, l = i>>4, i&15
TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr tbl['%%%X%X' % [h, l]] = i.chr
TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr tbl['%%%x%X' % [h, l]] = i.chr
TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr tbl['%%%X%x' % [h, l]] = i.chr
TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr tbl['%%%x%x' % [h, l]] = i.chr
end end
TBLDECWWWCOMP_['+'] = ' ' tbl['+'] = ' '
begin
TBLDECWWWCOMP_.replace(tbl)
TBLDECWWWCOMP_.freeze TBLDECWWWCOMP_.freeze
rescue
end
end end
raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%\h\h|[^%]+)*\z/ =~ str raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%\h\h|[^%]+)*\z/ =~ str
str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc) str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)