summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-08 17:13:55 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-08 17:13:55 (GMT)
commitcc1910b542ad5daf74df11cb87017ad9f1667bba (patch)
treed6fc507cef396b65a7d15e9245c316cd404d4e87 /marshal.c
parent85b1671b4257332ade223d9e167cea0bf0d40fdf (diff)
marshal.c: Numerics are not tainted
* include/ruby/ruby.h (OBJ_TAINTABLE, OBJ_TAINT, OBJ_INFECT), marshal.c (r_entry0): all Numerics never be tainted now. [ruby-core:57346] [Bug #8945] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/marshal.c b/marshal.c
index 4a1b55e..f9647fe 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1356,9 +1356,9 @@ r_entry0(VALUE v, st_index_t num, struct load_arg *arg)
}
if (arg->infection &&
!RB_TYPE_P(v, T_CLASS) && !RB_TYPE_P(v, T_MODULE)) {
- FL_SET(v, arg->infection);
+ OBJ_TAINT(v);
if ((VALUE)real_obj != Qundef)
- FL_SET((VALUE)real_obj, arg->infection);
+ OBJ_TAINT((VALUE)real_obj);
}
return v;
}