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

[Bug #20481] Check for unmarshaling ivar

Browse Source 
Prohibit setting instance variables of existing classes and modules
via link.
This commit is contained in:
Nobuyoshi Nakada 2024-05-04 22:17:04 +09:00
parent d9e6e6fb60
commit 8b9b150512
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
marshal.c
View File

@ -1696,6 +1696,11 @@ r_copy_ivar(VALUE v, VALUE data)
return v; return v;
} }
#define override_ivar_error(type, str) \
rb_raise(rb_eTypeError, \
"can't override instance variable of "type" '%"PRIsVALUE"'", \
(str))
static void static void
r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg) r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
{ {
@ -1703,6 +1708,12 @@ r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
len = r_long(arg); len = r_long(arg);
if (len > 0) { if (len > 0) {
if (RB_TYPE_P(obj, T_MODULE)) {
override_ivar_error("module", rb_mod_name(obj));
}
else if (RB_TYPE_P(obj, T_CLASS)) {
override_ivar_error("class", rb_class_name(obj));
}
do { do {
VALUE sym = r_symbol(arg); VALUE sym = r_symbol(arg);
VALUE val = r_object(arg); VALUE val = r_object(arg);
@ -1795,9 +1806,7 @@ append_extmod(VALUE obj, VALUE extmod)
#define prohibit_ivar(type, str) do { \ #define prohibit_ivar(type, str) do { \
if (!ivp || !*ivp) break; \ if (!ivp || !*ivp) break; \
rb_raise(rb_eTypeError, \ override_ivar_error(type, str); \
"can't override instance variable of "type" '%"PRIsVALUE"'", \
(str)); \
} while (0) } while (0)
static VALUE r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int type); static VALUE r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int type);

6
test/ruby/test_marshal.rb
View File

@ -571,12 +571,18 @@ class TestMarshal < Test::Unit::TestCase
assert_raise(TypeError) {Marshal.load("\x04\x08Ic\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")} assert_raise(TypeError) {Marshal.load("\x04\x08Ic\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}
assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")} assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}
assert_not_operator(TestClass, :instance_variable_defined?, :@ivar_bug) assert_not_operator(TestClass, :instance_variable_defined?, :@ivar_bug)
assert_raise(TypeError) {Marshal.load("\x04\x08[\x07c\x1bTestMarshal::TestClassI@\x06\x06:\x0e@ivar_bug\"\x08bug")}
assert_not_operator(TestClass, :instance_variable_defined?, :@ivar_bug)
end end
def test_module_ivar def test_module_ivar
assert_raise(TypeError) {Marshal.load("\x04\x08Im\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")} assert_raise(TypeError) {Marshal.load("\x04\x08Im\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")}
assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")} assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")}
assert_not_operator(TestModule, :instance_variable_defined?, :@ivar_bug) assert_not_operator(TestModule, :instance_variable_defined?, :@ivar_bug)
assert_raise(TypeError) {Marshal.load("\x04\x08[\x07m\x1cTestMarshal::TestModuleI@\x06\x06:\x0e@ivar_bug\"\x08bug")}
assert_not_operator(TestModule, :instance_variable_defined?, :@ivar_bug)
end end
class TestForRespondToFalse class TestForRespondToFalse