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

signal.c: preserve encoding

Browse source 
* signal.c (rb_f_kill, trap_signm): preserve argument encoding in
  error messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-30 14:27:15 +00:00
parent e5a7c2db98
commit a0dc245f72
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
signal.c
View file

@ -397,7 +397,7 @@ rb_f_kill(int argc, const VALUE *argv)
int negative = 0; int negative = 0;
int sig; int sig;
int i; int i;
volatile VALUE str; VALUE str;
const char *s; const char *s;
rb_secure(2); rb_secure(2);
@ -410,21 +410,23 @@ rb_f_kill(int argc, const VALUE *argv)
case T_SYMBOL: case T_SYMBOL:
str = rb_sym2str(argv[0]); str = rb_sym2str(argv[0]);
s = RSTRING_PTR(str);
if (!s) rb_raise(rb_eArgError, "bad signal");
goto str_signal; goto str_signal;
case T_STRING: case T_STRING:
s = RSTRING_PTR(argv[0]); str = argv[0];
str_signal: str_signal:
s = RSTRING_PTR(str);
if (s[0] == '-') { if (s[0] == '-') {
negative++; negative++;
s++; s++;
} }
if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0) if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0)
s += 3; s += 3;
if ((sig = signm2signo(s)) == 0) if ((sig = signm2signo(s)) == 0) {
rb_raise(rb_eArgError, "unsupported name `SIG%s'", s); long ofs = s - RSTRING_PTR(str);
if (ofs) str = rb_str_subseq(str, ofs, RSTRING_LEN(str)-ofs);
rb_raise(rb_eArgError, "unsupported name `SIG%"PRIsVALUE"'", str);
}
if (negative) if (negative)
sig = -sig; sig = -sig;
@ -433,7 +435,6 @@ rb_f_kill(int argc, const VALUE *argv)
default: default:
str = rb_check_string_type(argv[0]); str = rb_check_string_type(argv[0]);
if (!NIL_P(str)) { if (!NIL_P(str)) {
s = RSTRING_PTR(str);
goto str_signal; goto str_signal;
} }
rb_raise(rb_eArgError, "bad signal type %s", rb_raise(rb_eArgError, "bad signal type %s",
@ -1048,7 +1049,6 @@ trap_signm(VALUE vsig)
case T_SYMBOL: case T_SYMBOL:
vsig = rb_sym2str(vsig); vsig = rb_sym2str(vsig);
s = RSTRING_PTR(vsig); s = RSTRING_PTR(vsig);
if (!s) rb_raise(rb_eArgError, "bad signal");
goto str_signal; goto str_signal;
default: default:
@ -1058,8 +1058,11 @@ trap_signm(VALUE vsig)
if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0) if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0)
s += 3; s += 3;
sig = signm2signo(s); sig = signm2signo(s);
if (sig == 0 && strcmp(s, "EXIT") != 0) if (sig == 0 && strcmp(s, "EXIT") != 0) {
rb_raise(rb_eArgError, "unsupported signal SIG%s", s); long ofs = s - RSTRING_PTR(vsig);
if (ofs) vsig = rb_str_subseq(vsig, ofs, RSTRING_LEN(vsig)-ofs);
rb_raise(rb_eArgError, "unsupported signal SIG%"PRIsVALUE"", vsig);
}
} }
return sig; return sig;
} }

2
test/ruby/test_signal.rb
View file

@ -73,6 +73,7 @@ class TestSignal < Test::Unit::TestCase
def test_invalid_signal_name def test_invalid_signal_name
assert_raise(ArgumentError) { Process.kill(:XXXXXXXXXX, $$) } assert_raise(ArgumentError) { Process.kill(:XXXXXXXXXX, $$) }
assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Process.kill("\u{30eb 30d3 30fc}", $$) }
end if Process.respond_to?(:kill) end if Process.respond_to?(:kill)
def test_signal_exception def test_signal_exception
@ -162,6 +163,7 @@ class TestSignal < Test::Unit::TestCase
assert_raise(ArgumentError) { Signal.trap("XXXXXXXXXX", "SIG_DFL") } assert_raise(ArgumentError) { Signal.trap("XXXXXXXXXX", "SIG_DFL") }
assert_raise_with_message(ArgumentError, /\u{30eb 30d3 30fc}/) { Signal.trap("\u{30eb 30d3 30fc}", "SIG_DFL") }
ensure ensure
Signal.trap(:INT, oldtrap) if oldtrap Signal.trap(:INT, oldtrap) if oldtrap
end end