kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

hash.c: aset deduplicates un-tainted string

Browse source 
We revisit [Bug #9188] since st.c is much improved since then,
and benchmarks against so_k_nucleotide seem to indicate little
or no performance change compared to before.

[ruby-core:89555] [Feature #15251]

From: Anmol Chopra <chopraanmol1@gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-10-26 05:32:47 +00:00
parent 7cc758f7a8
commit 1e83e15ab5
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hash.c
View file

@ -1587,11 +1587,15 @@ VALUE
rb_hash_key_str(VALUE key)
{
VALUE k;
int not_tainted = !RB_OBJ_TAINTED(key);
if (!RB_OBJ_TAINTED(key) &&
if (not_tainted &&
(k = fstring_existing_str(key)) != Qnil) {
return k;
}
else if(not_tainted) {
return rb_fstring(key);
}
else {
return rb_str_new_frozen(key);
}

18
test/ruby/test_hash.rb
View file

@ -280,6 +280,24 @@ class TestHash < Test::Unit::TestCase
assert_same a.keys[0], b.keys[0]
end
def test_ASET_fstring_non_literal_key
underscore = "_"
non_literal_strings = Proc.new{ ["abc#{underscore}def", "abc" * 5, "abc" + "def", "" << "ghi" << "jkl"] }
a, b = {}, {}
non_literal_strings.call.each do |string|
assert_equal 1, a[string] = 1
end
non_literal_strings.call.each do |string|
assert_equal 1, b[string] = 1
end
[a.keys, b.keys].transpose.each do |key_a, key_b|
assert_same key_a, key_b
end
end
def test_hash_aset_fstring_identity
h = {}.compare_by_identity
h['abc'] = 1