diff options
-rw-r--r-- | hash.c | 24 | ||||
-rw-r--r-- | internal.h | 1 | ||||
-rw-r--r-- | st.c | 4 | ||||
-rw-r--r-- | test/ruby/test_hash.rb | 3 |
4 files changed, 21 insertions, 11 deletions
@@ -1582,19 +1582,25 @@ fstring_existing_str(VALUE str) } } +VALUE +rb_hash_key_str(VALUE key) +{ + VALUE k; + + if (!RB_OBJ_TAINTED(key) && + (k = fstring_existing_str(key)) != Qnil) { + return k; + } + else { + return rb_str_new_frozen(key); + } +} + 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)) { - VALUE k; - - if (!RB_OBJ_TAINTED(*key) && - (k = fstring_existing_str(*key)) != Qnil) { - *key = k; - } - else { - *key = rb_str_new_frozen(*key); - } + *key = rb_hash_key_str(*key); } return hash_aset(key, val, arg, existing); } diff --git a/internal.h b/internal.h index 4ccf3218c6..5fe888cd04 100644 --- a/internal.h +++ b/internal.h @@ -1284,6 +1284,7 @@ st_table *rb_init_identtable(void); st_table *rb_init_identtable_with_size(st_index_t size); VALUE rb_hash_compare_by_id_p(VALUE hash); VALUE rb_to_hash_type(VALUE obj); +VALUE rb_hash_key_str(VALUE); #define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) VALUE rb_hash_keys(VALUE hash); @@ -2114,8 +2114,8 @@ st_rehash(st_table *tab) static st_data_t st_stringify(VALUE key) { - return (rb_obj_class(key) == rb_cString) ? - rb_str_new_frozen(key) : key; + return (rb_obj_class(key) == rb_cString && !RB_OBJ_FROZEN(key)) ? + rb_hash_key_str(key) : key; } static void diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 7162f9d01f..313c2fd9de 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -298,6 +298,9 @@ class TestHash < Test::Unit::TestCase b = {"ABC" => :t} assert_same a.keys[0], b.keys[0] assert_same "ABC".freeze, a.keys[0] + var = +'ABC' + c = { var => :t } + assert_same "ABC".freeze, c.keys[0] end def test_tainted_string_key |