merge revision(s) 58200: [Backport #13376]

	* hash.c (any_hash): fix Symbol#hash to be nondeterministic.
	  The patch was provided by Eric Wong. [ruby-core:80433] [Bug #13376]

	test/ruby/test_symbol.rb: new test for nondeterminism

	We need to ensure hashes for static symbols remain
	non-deterministic to avoid DoS attacks.   This is currently the
	case since 2.4+, but was not for the 2.3 series.

	* test/ruby/test_symbol.rb (test_hash_nondeterministic): new test
	  [ruby-core:80430] [Bug #13376]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/hash.c b/hash.c
index 58a3d04023..d9826c4053 100644
--- a/hash.c
+++ b/hash.c
@@ -139,6 +139,7 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
 	if (a == Qundef) return 0;
 	if (STATIC_SYM_P(a)) {
 	    hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);
+	    hnum = rb_hash_start(hnum);
 	    goto out;
 	}
 	else if (FLONUM_P(a)) {