mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge revision(s) 097d742a1ed53afb91e83aef01365d68b763357b: [Backport #20009]

Browse Source 
[Bug #20009] Support marshaling non-ASCII name class/module
This commit is contained in:
nagachika 2025-07-19 11:16:49 +09:00
parent 3471ee0749
commit 581be2b79c
4 changed files with 85 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
marshal.c
View File

@ -474,6 +474,31 @@ w_float(double d, struct dump_arg *arg)
}
}
static VALUE
w_encivar(VALUE str, struct dump_arg *arg)
{
VALUE encname = encoding_name(str, arg);
if (NIL_P(encname) ||
is_ascii_string(str)) {
return Qnil;
}
w_byte(TYPE_IVAR, arg);
return encname;
}
static void
w_encname(VALUE encname, struct dump_arg *arg)
{
if (!NIL_P(encname)) {
struct dump_call_arg c_arg;
c_arg.limit = 1;
c_arg.arg = arg;
w_long(1L, arg);
w_encoding(encname, &c_arg);
}
}
static void
w_symbol(VALUE sym, struct dump_arg *arg)
{
@ -490,24 +515,11 @@ w_symbol(VALUE sym, struct dump_arg *arg)
if (!sym) {
rb_raise(rb_eTypeError, "can't dump anonymous ID %"PRIdVALUE, sym);
}
encname = encoding_name(sym, arg);
if (NIL_P(encname) ||
is_ascii_string(sym)) {
encname = Qnil;
}
else {
w_byte(TYPE_IVAR, arg);
}
encname = w_encivar(sym, arg);
w_byte(TYPE_SYMBOL, arg);
w_bytes(RSTRING_PTR(sym), RSTRING_LEN(sym), arg);
st_add_direct(arg->symbols, orig_sym, arg->symbols->num_entries);
if (!NIL_P(encname)) {
struct dump_call_arg c_arg;
c_arg.limit = 1;
c_arg.arg = arg;
w_long(1L, arg);
w_encoding(encname, &c_arg);
}
w_encname(encname, arg);
}
}
@ -964,19 +976,23 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
if (FL_TEST(obj, FL_SINGLETON)) {
rb_raise(rb_eTypeError, "singleton class can't be dumped");
}
w_byte(TYPE_CLASS, arg);
{
VALUE path = class2path(obj);
VALUE encname = w_encivar(path, arg);
w_byte(TYPE_CLASS, arg);
w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
w_encname(encname, arg);
RB_GC_GUARD(path);
}
break;
case T_MODULE:
w_byte(TYPE_MODULE, arg);
{
VALUE path = class2path(obj);
VALUE encname = w_encivar(path, arg);
w_byte(TYPE_MODULE, arg);
w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
w_encname(encname, arg);
RB_GC_GUARD(path);
}
break;
@ -1713,6 +1729,34 @@ r_copy_ivar(VALUE v, VALUE data)
return v;
}
static int
r_ivar_encoding(VALUE obj, struct load_arg *arg, VALUE sym, VALUE val)
{
int idx = sym2encidx(sym, val);
if (idx >= 0) {
if (rb_enc_capable(obj)) {
rb_enc_associate_index(obj, idx);
}
else {
rb_raise(rb_eArgError, "%"PRIsVALUE" is not enc_capable", obj);
}
return TRUE;
}
return FALSE;
}
static long
r_encname(VALUE obj, struct load_arg *arg)
{
long len = r_long(arg);
if (len > 0) {
VALUE sym = r_symbol(arg);
VALUE val = r_object(arg);
len -= r_ivar_encoding(obj, arg, sym, val);
}
return len;
}
static void
r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
{
@ -1723,14 +1767,7 @@ r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
do {
VALUE sym = r_symbol(arg);
VALUE val = r_object(arg);
int idx = sym2encidx(sym, val);
if (idx >= 0) {
if (rb_enc_capable(obj)) {
rb_enc_associate_index(obj, idx);
}
else {
rb_raise(rb_eArgError, "%"PRIsVALUE" is not enc_capable", obj);
}
if (r_ivar_encoding(obj, arg, sym, val)) {
if (has_encoding) *has_encoding = TRUE;
}
else if (symname_equal_lit(sym, name_s_ruby2_keywords_flag)) {
@ -2256,6 +2293,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
{
VALUE str = r_bytes(arg);
if (ivp && *ivp > 0) *ivp = r_encname(str, arg) > 0;
v = path2class(str);
prohibit_ivar("class", str);
v = r_entry(v, arg);
@ -2267,6 +2305,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
{
VALUE str = r_bytes(arg);
if (ivp && *ivp > 0) *ivp = r_encname(str, arg) > 0;
v = path2module(str);
prohibit_ivar("module", str);
v = r_entry(v, arg);

15
spec/ruby/core/marshal/dump_spec.rb
View File

@ -194,8 +194,9 @@ describe "Marshal.dump" do
end
it "dumps a class with multibyte characters in name" do
source_object = eval("MarshalSpec::MultibyteぁあぃいClass".force_encoding(Encoding::UTF_8))
Marshal.dump(source_object).should == "\x04\bc,MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Class"
source_object = eval("MarshalSpec::MultibyteぁあぃいClass".dup.force_encoding(Encoding::UTF_8))
Marshal.dump(source_object).should == "\x04\bIc,MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Class\x06:\x06ET"
Marshal.load(Marshal.dump(source_object)) == source_object
end
it "raises TypeError with an anonymous Class" do
@ -217,8 +218,9 @@ describe "Marshal.dump" do
end
it "dumps a module with multibyte characters in name" do
source_object = eval("MarshalSpec::MultibyteけげこごModule".force_encoding(Encoding::UTF_8))
Marshal.dump(source_object).should == "\x04\bm-MarshalSpec::Multibyte\xE3\x81\x91\xE3\x81\x92\xE3\x81\x93\xE3\x81\x94Module"
source_object = eval("MarshalSpec::MultibyteけげこごModule".dup.force_encoding(Encoding::UTF_8))
Marshal.dump(source_object).should == "\x04\bIm-MarshalSpec::Multibyte\xE3\x81\x91\xE3\x81\x92\xE3\x81\x93\xE3\x81\x94Module\x06:\x06ET"
Marshal.load(Marshal.dump(source_object)) == source_object
end
it "raises TypeError with an anonymous Module" do
@ -685,8 +687,9 @@ describe "Marshal.dump" do
end
it "dumps a Time subclass with multibyte characters in name" do
source_object = eval("MarshalSpec::MultibyteぁあぃいTime".force_encoding(Encoding::UTF_8))
Marshal.dump(source_object).should == "\x04\bc+MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Time"
source_object = eval("MarshalSpec::MultibyteぁあぃいTime".dup.force_encoding(Encoding::UTF_8))
Marshal.dump(source_object).should == "\x04\bIc+MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Time\x06:\x06ET"
Marshal.load(Marshal.dump(source_object)) == source_object
end
it "raises TypeError with an anonymous Time subclass" do

12
test/ruby/test_marshal.rb
View File

@ -268,7 +268,11 @@ class TestMarshal < Test::Unit::TestCase
classISO8859_1.name
ClassISO8859_1 = classISO8859_1
def test_class_nonascii
moduleUTF8 = const_set("C\u{30af 30e9 30b9}", Module.new)
moduleUTF8.name
ModuleUTF8 = moduleUTF8
def test_nonascii_class_instance
a = ClassUTF8.new
assert_instance_of(ClassUTF8, Marshal.load(Marshal.dump(a)), '[ruby-core:24790]')
@ -301,6 +305,12 @@ class TestMarshal < Test::Unit::TestCase
end
end
def test_nonascii_class_module
assert_same(ClassUTF8, Marshal.load(Marshal.dump(ClassUTF8)))
assert_same(ClassISO8859_1, Marshal.load(Marshal.dump(ClassISO8859_1)))
assert_same(ModuleUTF8, Marshal.load(Marshal.dump(ModuleUTF8)))
end
def test_regexp2
assert_equal(/\\u/, Marshal.load("\004\b/\b\\\\u\000"))
assert_equal(/u/, Marshal.load("\004\b/\a\\u\000"))

2
version.h
View File

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 163
#define RUBY_PATCHLEVEL 164
#include "ruby/version.h"
#include "ruby/internal/abi.h"