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

Marshal.load: restore instance variables on Regexp

Browse Source 
[Bug #19439]

The instance variables were restore on the Regexp source,
not the regexp itself.

Unfortunately we have a bit of a chicken and egg problem.

The source holds the encoding, and the encoding need to be set on
the source to be able to instantiate the Regexp.

So the instance variables have to be read on the `source`.
To correct this we transfert the instance variables after
instantiating the Regexp.

The only way to avoid this would be to read the instance variable
twice and rewind.
This commit is contained in:
Jean Boussier 2023-02-16 12:18:27 +01:00 committed by Jean Boussier
parent 61709227bb
commit d2520b7b76
Notes: git 2023-02-21 12:57:32 +00:00 
Merged: https://github.com/ruby/ruby/pull/7323
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
marshal.c
View File

@ -1803,6 +1803,20 @@ r_object0(struct load_arg *arg, bool partial, int *ivp, VALUE extmod)
return r_object_for(arg, partial, ivp, extmod, type);
}
static int
r_move_ivar(st_data_t k, st_data_t v, st_data_t d)
{
ID key = (ID)k;
VALUE value = (VALUE)v;
VALUE dest = (VALUE)d;
if (rb_is_instance_id(key)) {
rb_ivar_set(dest, key, value);
return ST_DELETE;
}
return ST_CONTINUE;
}
static VALUE
r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int type)
{
@ -1826,7 +1840,6 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
case TYPE_IVAR:
{
int ivar = TRUE;
v = r_object0(arg, true, &ivar, extmod);
if (ivar) r_ivar(v, NULL, arg);
v = r_leave(v, arg, partial);
@ -2020,7 +2033,10 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
}
rb_str_set_len(str, dst - ptr);
}
v = r_entry0(rb_reg_new_str(str, options), idx, arg);
VALUE regexp = rb_reg_new_str(str, options);
rb_ivar_foreach(str, r_move_ivar, regexp);
v = r_entry0(regexp, idx, arg);
v = r_leave(v, arg, partial);
}
break;

11
spec/ruby/core/marshal/shared/load.rb
View File

@ -740,6 +740,17 @@ describe :marshal_load, shared: true do
new_obj_metaclass_ancestors[@num_self_class, 3].should ==
[Meths, UserRegexp, Regexp]
end
ruby_bug "#19439", ""..."3.3" do
it "restore the regexp instance variables" do
obj = Regexp.new("hello")
obj.instance_variable_set(:@regexp_ivar, [42])
new_obj = Marshal.send(@method, "\x04\bI/\nhello\x00\a:\x06EF:\x11@regexp_ivar[\x06i/")
new_obj.instance_variables.should == [:@regexp_ivar]
new_obj.instance_variable_get(:@regexp_ivar).should == [42]
end
end
end
describe "for a Float" do