archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 4329554f171fdb483cafa672df5f2a08741940c5,b5c74d548872388921402ff2db36be15e924a89b: [Backport #19985]

Browse source 
[Bug #19985] Raise LoadError with the converted feature name

	`Kernel#require` converts feature name objects that have the `to_path`
	method such as `Pathname`, but had used the original object on error
	and had resulted in an unexpected `TypeError`.
	---
	 load.c                    | 14 +++++++++++---
	 test/ruby/test_require.rb | 26 +++++++++++++++++++++-----
	 2 files changed, 32 insertions(+), 8 deletions(-)

	Ease the `Encoding::CompatibilityError` test failure

	At the time this test first started using `assert_raise_with_message`,
	it did not touch `Encoding.default_internal`.
	---
	 test/ruby/test_require.rb | 3 ++-
	 1 file changed, 2 insertions(+), 1 deletion(-)
This commit is contained in:
nagachika 2023-11-09 17:36:42 +09:00
parent 8bbf909bb5
commit 2aaa9af759
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
load.c
View file

@ -893,6 +893,7 @@ load_unlock(rb_vm_t *vm, const char *ftptr, int done)
}
}
static VALUE rb_require_string_internal(VALUE fname);
/*
* call-seq:
@ -955,7 +956,7 @@ rb_f_require_relative(VALUE obj, VALUE fname)
rb_loaderror("cannot infer basepath");
}
base = rb_file_dirname(base);
return rb_require_string(rb_file_absolute_path(fname, base));
return rb_require_string_internal(rb_file_absolute_path(fname, base));
}
typedef int (*feature_func)(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn);
@ -1164,7 +1165,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
volatile bool reset_ext_config = false;
struct rb_ext_config prev_ext_config;
fname = rb_get_path(fname);
path = rb_str_encode_ospath(fname);
RUBY_DTRACE_HOOK(REQUIRE_ENTRY, RSTRING_PTR(fname));
saved_path = path;
@ -1289,6 +1289,12 @@ ruby_require_internal(const char *fname, unsigned int len)
VALUE
rb_require_string(VALUE fname)
{
return rb_require_string_internal(FilePathValue(fname));
}
static VALUE
rb_require_string_internal(VALUE fname)
{
rb_execution_context_t *ec = GET_EC();
int result = require_internal(ec, fname, 1, RTEST(ruby_verbose));
@ -1306,7 +1312,9 @@ rb_require_string(VALUE fname)
VALUE
rb_require(const char *fname)
{
return rb_require_string(rb_str_new_cstr(fname));
struct RString fake;
VALUE str = rb_setup_fake_str(&fake, fname, strlen(fname), 0);
return rb_require_string_internal(str);
}
#if EXTSTATIC