archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 52211: [Backport #11610] [Backport #11637]

Browse source 
* io.c (argf_next_argv): check ARGV element type, and try
	  conversion if necessary.  [ruby-core:71140] [Bug #11610]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-11-18 15:10:54 +00:00
parent 557ba3fee5
commit 0181fbc4de
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Nov 19 00:01:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_next_argv): check ARGV element type, and try
conversion if necessary. [ruby-core:71140] [Bug #11610]
Wed Nov 18 23:29:32 2015 Aaron Patterson <tenderlove@ruby-lang.org> Wed Nov 18 23:29:32 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support * ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support

24
io.c
View file

@ -7920,9 +7920,11 @@ argf_next_argv(VALUE argf)
if (ARGF.next_p == 1) { if (ARGF.next_p == 1) {
retry: retry:
if (RARRAY_LEN(ARGF.argv) > 0) { if (RARRAY_LEN(ARGF.argv) > 0) {
ARGF.filename = rb_str_encode_ospath(rb_ary_shift(ARGF.argv)); VALUE filename = rb_ary_shift(ARGF.argv);
fn = StringValueCStr(ARGF.filename); StringValueCStr(filename);
if (strlen(fn) == 1 && fn[0] == '-') { ARGF.filename = rb_str_encode_ospath(filename);
fn = StringValueCStr(filename);
if (RSTRING_LEN(filename) == 1 && fn[0] == '-') {
ARGF.current_file = rb_stdin; ARGF.current_file = rb_stdin;
if (ARGF.inplace) { if (ARGF.inplace) {
rb_warn("Can't do inplace edit for stdio; skipping"); rb_warn("Can't do inplace edit for stdio; skipping");
@ -7931,7 +7933,7 @@ argf_next_argv(VALUE argf)
} }
else { else {
VALUE write_io = Qnil; VALUE write_io = Qnil;
int fr = rb_sysopen(ARGF.filename, O_RDONLY, 0); int fr = rb_sysopen(filename, O_RDONLY, 0);
if (ARGF.inplace) { if (ARGF.inplace) {
struct stat st; struct stat st;
@ -7945,7 +7947,7 @@ argf_next_argv(VALUE argf)
rb_io_close(rb_stdout); rb_io_close(rb_stdout);
} }
fstat(fr, &st); fstat(fr, &st);
str = ARGF.filename; str = filename;
if (*ARGF.inplace) { if (*ARGF.inplace) {
str = rb_str_dup(str); str = rb_str_dup(str);
rb_str_cat2(str, ARGF.inplace); rb_str_cat2(str, ARGF.inplace);
@ -7955,14 +7957,14 @@ argf_next_argv(VALUE argf)
(void)unlink(RSTRING_PTR(str)); (void)unlink(RSTRING_PTR(str));
if (rename(fn, RSTRING_PTR(str)) < 0) { if (rename(fn, RSTRING_PTR(str)) < 0) {
rb_warn("Can't rename %"PRIsVALUE" to %"PRIsVALUE": %s, skipping file", rb_warn("Can't rename %"PRIsVALUE" to %"PRIsVALUE": %s, skipping file",
ARGF.filename, str, strerror(errno)); filename, str, strerror(errno));
goto retry; goto retry;
} }
fr = rb_sysopen(str, O_RDONLY, 0); fr = rb_sysopen(str, O_RDONLY, 0);
#else #else
if (rename(fn, RSTRING_PTR(str)) < 0) { if (rename(fn, RSTRING_PTR(str)) < 0) {
rb_warn("Can't rename %"PRIsVALUE" to %"PRIsVALUE": %s, skipping file", rb_warn("Can't rename %"PRIsVALUE" to %"PRIsVALUE": %s, skipping file",
ARGF.filename, str, strerror(errno)); filename, str, strerror(errno));
close(fr); close(fr);
goto retry; goto retry;
} }
@ -7974,13 +7976,13 @@ argf_next_argv(VALUE argf)
#else #else
if (unlink(fn) < 0) { if (unlink(fn) < 0) {
rb_warn("Can't remove %"PRIsVALUE": %s, skipping file", rb_warn("Can't remove %"PRIsVALUE": %s, skipping file",
ARGF.filename, strerror(errno)); filename, strerror(errno));
close(fr); close(fr);
goto retry; goto retry;
} }
#endif #endif
} }
fw = rb_sysopen(ARGF.filename, O_WRONLY|O_CREAT|O_TRUNC, 0666); fw = rb_sysopen(filename, O_WRONLY|O_CREAT|O_TRUNC, 0666);
#ifndef NO_SAFE_RENAME #ifndef NO_SAFE_RENAME
fstat(fw, &st2); fstat(fw, &st2);
#ifdef HAVE_FCHMOD #ifdef HAVE_FCHMOD
@ -7996,9 +7998,9 @@ argf_next_argv(VALUE argf)
err = chown(fn, st.st_uid, st.st_gid); err = chown(fn, st.st_uid, st.st_gid);
#endif #endif
if (err && getuid() == 0 && st2.st_uid == 0) { if (err && getuid() == 0 && st2.st_uid == 0) {
const char *wkfn = RSTRING_PTR(ARGF.filename); const char *wkfn = RSTRING_PTR(filename);
rb_warn("Can't set owner/group of %"PRIsVALUE" to same as %"PRIsVALUE": %s, skipping file", rb_warn("Can't set owner/group of %"PRIsVALUE" to same as %"PRIsVALUE": %s, skipping file",
ARGF.filename, str, strerror(errno)); filename, str, strerror(errno));
(void)close(fr); (void)close(fr);
(void)close(fw); (void)close(fw);
(void)unlink(wkfn); (void)unlink(wkfn);

8
test/ruby/test_argf.rb
View file

@ -856,4 +856,12 @@ class TestArgf < Test::Unit::TestCase
assert_equal([49, 10, 50, 10, 51, 10, 52, 10, 53, 10, 54, 10], Marshal.load(f.read)) assert_equal([49, 10, 50, 10, 51, 10, 52, 10, 53, 10, 54, 10], Marshal.load(f.read))
end end
end end
def test_wrong_type
assert_separately([], <<-'end;')
bug11610 = '[ruby-core:71140] [Bug #11610]'
ARGV[0] = nil
assert_raise(TypeError, bug11610) {gets}
end;
end
end end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.4" #define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-11-18" #define RUBY_RELEASE_DATE "2015-11-19"
#define RUBY_PATCHLEVEL 188 #define RUBY_PATCHLEVEL 189
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11
#define RUBY_RELEASE_DAY 18 #define RUBY_RELEASE_DAY 19
#include "ruby/version.h" #include "ruby/version.h"