summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-07-11 07:42:27 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-07-11 07:42:27 (GMT)
commit5168fb54e327be6414e53af54c149948a94e623b (patch)
tree5e8320057bca4983b6d98e71fbbac21b270581c7 /hash.c
parentd2dd18ed16c977e278c18946ca679ba13b5722f6 (diff)
tainted string should be tainted.
* hash.c (hash_aset_str): create frozen string for tainted objects. (should not use fsting table on this case). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c32
1 files changed, 23 insertions, 9 deletions
diff --git a/hash.c b/hash.c
index 099a62d..7a0beb7 100644
--- a/hash.c
+++ b/hash.c
@@ -1516,20 +1516,34 @@ hash_aset(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
return ST_CONTINUE;
}
+static VALUE
+fstring_existing_str(VALUE str)
+{
+ st_data_t fstr;
+ st_table *tbl = rb_vm_fstring_table();
+
+ if (st_lookup(tbl, str, &fstr)) {
+ if (rb_objspace_garbage_object_p(fstr)) {
+ return rb_fstring(str);
+ }
+ else {
+ return (VALUE)fstr;
+ }
+ }
+ else {
+ return Qnil;
+ }
+}
+
static int
hash_aset_str(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
{
if (!existing && !RB_OBJ_FROZEN(*key)) {
- st_data_t fstr;
- st_table *tbl = rb_vm_fstring_table();
+ VALUE k;
- if (st_lookup(tbl, *key, &fstr)) {
- if (rb_objspace_garbage_object_p(fstr)) {
- *key = rb_fstring(*key);
- }
- else {
- *key = (VALUE)fstr;
- }
+ if (!RB_OBJ_TAINTED(*key) &&
+ (k = fstring_existing_str(*key)) != Qnil) {
+ *key = k;
}
else {
*key = rb_str_new_frozen(*key);