1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

error.c: negative uplevel

Browse Source 
* error.c (rb_warn_m): negative uplevel is not allowed.
  [ruby-core:84568] [Bug #14262]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-12-31 13:01:55 +00:00
parent d0afbff3b0
commit fa2e4a2061
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
error.c
View File

@ -342,7 +342,11 @@ rb_warn_m(int argc, VALUE *argv, VALUE exc)
uplevel = Qnil; uplevel = Qnil;
} }
else if (!NIL_P(uplevel)) { else if (!NIL_P(uplevel)) {
uplevel = LONG2NUM((long)NUM2ULONG(uplevel) + 1); long lev = NUM2LONG(uplevel);
if (lev < 0) {
rb_raise(rb_eArgError, "negative level (%ld)", lev);
}
uplevel = LONG2NUM(lev + 1);
uplevel = rb_vm_thread_backtrace_locations(1, &uplevel, GET_THREAD()->self); uplevel = rb_vm_thread_backtrace_locations(1, &uplevel, GET_THREAD()->self);
if (!NIL_P(uplevel)) { if (!NIL_P(uplevel)) {
uplevel = rb_ary_entry(uplevel, 0); uplevel = rb_ary_entry(uplevel, 0);

1
test/ruby/test_exception.rb
View File

@ -1007,6 +1007,7 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status|
def test_kernel_warn_uplevel def test_kernel_warn_uplevel
warning = capture_warning_warn {warn("test warning", uplevel: 0)} warning = capture_warning_warn {warn("test warning", uplevel: 0)}
assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0]) assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0])
assert_raise(ArgumentError) {warn("test warning", uplevel: -1)}
end end
def test_warning_warn_invalid_argument def test_warning_warn_invalid_argument