diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-01 07:35:37 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-01 07:35:37 +0000 |
commit | 3fe939564fc5f4dde52a6b9bc385e558e3423256 (patch) | |
tree | 9e2a525cb2d692d9fcd530553339d7ab88b92556 /marshal.c | |
parent | 46ea3f65551e2467bdd4d6c8bd0c78644c955326 (diff) | |
download | ruby-3fe939564fc5f4dde52a6b9bc385e558e3423256.tar.gz |
marshal.c: prohibit_ivar
* marshal.c (r_object0): prohibit setting instance variables of
exising class/module.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1434,6 +1434,13 @@ append_extmod(VALUE obj, VALUE extmod) return obj; } +#define prohibit_ivar(type, str) do { \ + if (!ivp || !*ivp) break; \ + rb_raise(rb_eTypeError, \ + "can't override instance variable of "type" `%"PRIsVALUE"'", \ + (str)); \ + } while (0) + static VALUE r_object0(struct load_arg *arg, int *ivp, VALUE extmod) { @@ -1802,6 +1809,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) VALUE str = r_bytes(arg); v = rb_path_to_class(str); + prohibit_ivar("class/module", str); v = r_entry(v, arg); v = r_leave(v, arg); } @@ -1812,6 +1820,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) VALUE str = r_bytes(arg); v = path2class(str); + prohibit_ivar("class", str); v = r_entry(v, arg); v = r_leave(v, arg); } @@ -1822,6 +1831,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) VALUE str = r_bytes(arg); v = path2module(str); + prohibit_ivar("module", str); v = r_entry(v, arg); v = r_leave(v, arg); } |