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

merge revision(s) a7f5d6ab88 c9ab8fe2 [Backport#17877]

Browse source 
a fix of RDoc for CVE-2021-31799
This commit is contained in:
NAKAMURA Usaku 2021-05-31 23:44:23 +09:00
parent d8bbbc308e
commit 483f303d02
No known key found for this signature in database
GPG key ID: C5FE8AEA64F81259
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/rdoc/rdoc.rb
View file

@ -430,7 +430,7 @@ The internal error was:
files.reject do |file|
file =~ /\.(?:class|eps|erb|scpt\.txt|svg|ttf|yml)$/i or
(file =~ /tags$/i and
open(file, 'rb') { |io|
File.open(file, 'rb') { |io|
io.read(100) =~ /\A(\f\n[^,]+,\d+$|!_TAG_)/
})
end

13
test/rdoc/test_rdoc_rdoc.rb
View file

@ -426,6 +426,19 @@ class TestRDocRDoc < RDoc::TestCase
end
end
def test_remove_unparseable_CVE_2021_31799
omit 'for Un*x platforms' if Gem.win_platform?
temp_dir do
file_list = ['| touch evil.txt && echo tags']
file_list.each do |f|
FileUtils.touch f
end
assert_equal file_list, @rdoc.remove_unparseable(file_list)
assert_equal file_list, Dir.children('.')
end
end
def test_setup_output_dir
Dir.mktmpdir {|d|
path = File.join d, 'testdir'

2
version.h
View file

@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 187
#define RUBY_PATCHLEVEL 188
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 5