summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-04 04:10:00 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-04 04:10:00 +0000
commitf2532ab8cac66cec352b6067ebbd4096cb9ca590 (patch)
treee1b3ced211f81b2da0c48161419dc3dd25b46731 /string.c
parent8068925a50d71268d9d5cbfc61e6ae3988972d66 (diff)
Revert r52872 "string.c: should not taint fstring"
This reverts commit b887c7c20ab81b50ed7cb8c7db3218c443985d6b. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/string.c b/string.c
index 4cb62375da..d1a051b6dd 100644
--- a/string.c
+++ b/string.c
@@ -1247,9 +1247,7 @@ rb_obj_as_string(VALUE obj)
str = rb_funcall(obj, idTo_s, 0);
if (!RB_TYPE_P(str, T_STRING))
return rb_any_to_s(obj);
- if (!FL_SET(str, RSTRING_FSTR) && FL_ABLE(obj))
- /* fstring must not be tainted, at least */
- OBJ_INFECT_RAW(str, obj);
+ OBJ_INFECT(str, obj);
return str;
}