diff options
| -rw-r--r-- | signal.c | 20 | ||||
| -rw-r--r-- | test/ruby/test_signal.rb | 2 |
2 files changed, 9 insertions, 13 deletions
@@ -1206,23 +1206,17 @@ trap_signm(VALUE vsig) int sig = -1; const char *s; - switch (TYPE(vsig)) { - case T_FIXNUM: + if (FIXNUM_P(vsig)) { sig = FIX2INT(vsig); if (sig < 0 || sig >= NSIG) { rb_raise(rb_eArgError, "invalid signal number (%d)", sig); } - break; - - case T_SYMBOL: - vsig = rb_sym2str(vsig); - s = RSTRING_PTR(vsig); - goto str_signal; - - default: - s = StringValuePtr(vsig); - - str_signal: + } + else { + if (RB_SYMBOL_P(vsig)) { + vsig = rb_sym2str(vsig); + } + s = StringValueCStr(vsig); if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0) s += 3; sig = signm2signo(s); diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb index 3357b871e9..931e104d83 100644 --- a/test/ruby/test_signal.rb +++ b/test/ruby/test_signal.rb @@ -164,6 +164,8 @@ class TestSignal < Test::Unit::TestCase 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") } + + assert_raise(ArgumentError) { Signal.trap("EXIT\0") {} } ensure Signal.trap(:INT, oldtrap) if oldtrap end |