diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:18:56 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:18:56 +0000 |
commit | 8c85ad0519d1e876040ca3a606d28f29b21fdeb1 (patch) | |
tree | 7a6e53b81aedf8476894e24da03cc4374a3d90e2 | |
parent | aa818c8c86f624ebafa049236ffde239f34b4462 (diff) |
merges r20804 from trunk into ruby_1_9_1.
* string.c (rb_str_hash): gets rid of collisions between different
encoding strings. [ruby-core:20526]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Dec 17 11:01:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_hash): gets rid of collisions between differen + encoding strings. [ruby-core:20526] + Tue Dec 16 22:55:11 2008 NAKAMURA Usaku <usa@ruby-lang.org> * bin/testrb: set $0. @@ -2014,7 +2014,11 @@ rb_memhash(const void *ptr, long len) int rb_str_hash(VALUE str) { - return rb_memhash((const void *)RSTRING_PTR(str), RSTRING_LEN(str)); + int e = ENCODING_GET(str); + if (e) { + if (rb_enc_str_asciionly_p(str)) e = 0; + } + return rb_memhash((const void *)RSTRING_PTR(str), RSTRING_LEN(str)) ^ e; } int |