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

* ext/psych/lib/psych.rb: default open YAML files with utf8 external

Browse source 
encoding. [ruby-core:42967]
* test/psych/test_tainted.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2012-02-28 01:30:15 +00:00
parent 58fb7e9151
commit 0cb987bc51
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Feb 28 10:28:51 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych.rb: default open YAML files with utf8 external
encoding. [ruby-core:42967]
* test/psych/test_tainted.rb: ditto
Mon Feb 27 23:46:09 2012 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (opt_bv_decl): allow newline at the end. [ruby-dev:45292]

4
ext/psych/lib/psych.rb
View file

@ -156,7 +156,7 @@ module Psych
#
# Raises a Psych::SyntaxError when a YAML syntax error is detected.
def self.parse_file filename
File.open filename do |f|
File.open filename, 'r:bom|utf-8' do |f|
parse f, filename
end
end
@ -264,7 +264,7 @@ module Psych
# Load the document contained in +filename+. Returns the yaml contained in
# +filename+ as a ruby object
def self.load_file filename
File.open(filename) { |f| self.load f, filename }
File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
end
# :stopdoc:

2
test/psych/test_tainted.rb
View file

@ -121,7 +121,7 @@ module Psych
t.binmode
t.write string
t.close
File.open(t.path) { |f|
File.open(t.path, 'r:bom|utf-8') { |f|
@parser.parse f
}
t.close(true)