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) r47900: [Backport #10035]

Browse source 
* lib/find.rb (Find.find): Call to_path for arguments to obtain
	  strings.
	  [ruby-core:63713] [Bug #10035] Reported by Herwin.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-10-15 15:31:03 +00:00
parent 03a93ba48d
commit c17ee11007
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Oct 16 00:30:30 2014 Tanaka Akira <akr@fsij.org>
* lib/find.rb (Find.find): Call to_path for arguments to obtain
strings.
[ruby-core:63713] [Bug #10035] Reported by Herwin.
Thu Oct 16 00:20:12 2014 Eric Wong <e@80x24.org>
* object.c (rb_class_real): do not dereference 0 VALUE

1
lib/find.rb
View file

@ -40,6 +40,7 @@ module Find
fs_encoding = Encoding.find("filesystem")
paths.collect!{|d| raise Errno::ENOENT unless File.exist?(d); d.dup}.each do |path|
path = path.to_path if path.respond_to? :to_path
enc = path.encoding == Encoding::US_ASCII ? fs_encoding : path.encoding
ps = [path]
while file = ps.shift

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.4"
#define RUBY_RELEASE_DATE "2014-10-16"
#define RUBY_PATCHLEVEL 256
#define RUBY_PATCHLEVEL 257
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10