diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 02:01:37 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 02:01:37 +0000 |
commit | 6bcd363ebf4fc4cde24fd94f48786d4da996e07e (patch) | |
tree | 618499270d1403629fe085727ab6d481a234fae0 | |
parent | 446bcf9a23758a5226f243ec8e2ab93e75e087ce (diff) | |
download | ruby-6bcd363ebf4fc4cde24fd94f48786d4da996e07e.tar.gz |
* 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/trunk@20804 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] + Wed Dec 17 09:50:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * test/ruby/test_metaclass.rb: removed codes for my debugging. @@ -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 |