Skip to content

Commit

Permalink
Raise when loading unprovided builtin function [Bug #17192]
Browse files Browse the repository at this point in the history
  • Loading branch information
nobu committed Nov 30, 2020
1 parent 73a337e commit 555bd83
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
7 changes: 3 additions & 4 deletions compile.c
Expand Up @@ -10296,14 +10296,13 @@ ibf_load_builtin(const struct ibf_load *load, ibf_offset_t *offset)
const char *name = (char *)ibf_load_ptr(load, offset, len);

if (0) {
for (int i=0; i<len; i++) fprintf(stderr, "%c", name[i]);
fprintf(stderr, "!!\n");
fprintf(stderr, "%.*s!!\n", len, name);
}

const struct rb_builtin_function *table = GET_VM()->builtin_function_table;
if (table == NULL) rb_bug("%s: table is not provided.", RUBY_FUNCTION_NAME_STRING);
if (table == NULL) rb_raise(rb_eArgError, "builtin function table is not provided");
if (strncmp(table[i].name, name, len) != 0) {
rb_bug("%s: index (%d) mismatch (expect %s but %s).", RUBY_FUNCTION_NAME_STRING, i, name, table[i].name);
rb_raise(rb_eArgError, "builtin function index (%d) mismatch (expect %s but %s)", i, name, table[i].name);
}
// fprintf(stderr, "load-builtin: name:%s(%d)\n", table[i].name, table[i].argc);

Expand Down
15 changes: 15 additions & 0 deletions test/ruby/test_iseq.rb
Expand Up @@ -590,6 +590,21 @@ def test_iseq_builtin_to_a
assert_equal([:func_ptr, :argc, :index, :name], invokebuiltin[1].keys)
end

def test_iseq_builtin_load
Tempfile.create(["builtin", ".iseq"]) do |f|
f.binmode
f.write(RubyVM::InstructionSequence.of(1.method(:abs)).to_binary)
f.close
assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
bin = File.binread(ARGV[0])
assert_raise(ArgumentError) do
RubyVM::InstructionSequence.load_from_binary(bin)
end
end;
end
end

def test_iseq_option_debug_level
assert_raise(TypeError) {ISeq.compile("", debug_level: "")}
assert_ruby_status([], "#{<<~"begin;"}\n#{<<~'end;'}")
Expand Down

0 comments on commit 555bd83

Please sign in to comment.