From cae3905e89ebfbfffa181bf94c3ed4550ef87619 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 4 Dec 2015 07:48:22 +0000 Subject: string.c: should not taint fstring * string.c (rb_obj_as_string): fstring should not be infected. re-apply r52872 and fix a typo. TODO: other frozen strings also may not be. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index d1a051b6dd..6d283dd145 100644 --- a/string.c +++ b/string.c @@ -1247,7 +1247,9 @@ 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); - OBJ_INFECT(str, obj); + if (!FL_TEST_RAW(str, RSTRING_FSTR) && FL_ABLE(obj)) + /* fstring must not be tainted, at least */ + OBJ_INFECT_RAW(str, obj); return str; } -- cgit v1.2.3