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

fix guards for glibc crypt(3) see #7312

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-11-20 13:09:15 +00:00
parent cea7600b52
commit bf445c240a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/ruby/test_m17n_comb.rb
View file

@ -722,14 +722,14 @@ class TestM17NComb < Test::Unit::TestCase
def test_str_crypt def test_str_crypt
begin begin
# glibc 2.16 or later denies salt contained other than [0-9A-Za-z./] #7312 # glibc 2.16 or later denies salt contained other than [0-9A-Za-z./] #7312
glibcver = `/lib/libc.so.6`[/\AGNU C Library.*version ([0-9.]+)/, 1].split('.') glibcver = `/lib/libc.so.6`[/\AGNU C Library.*version ([0-9.]+)/, 1].split('.').map(&:to_i)
strict_crypt = (glibcver <=> [2, 16]) > -1 strict_crypt = (glibcver <=> [2, 16]) > -1
rescue rescue
end end
combination(STRINGS, STRINGS) {|str, salt| combination(STRINGS, STRINGS) {|str, salt|
if strict_crypt if strict_crypt
next unless /\A[0-9a-zA-Z.\/]+\z/ =~ salt next unless salt.ascii_only? && /\A[0-9a-zA-Z.\/]+\z/ =~ salt
end end
if a(salt).length < 2 if a(salt).length < 2
assert_raise(ArgumentError) { str.crypt(salt) } assert_raise(ArgumentError) { str.crypt(salt) }