nobu	2010-12-01 14:36:39 +0900 (Wed, 01 Dec 2010)

  New Revision: 29991

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29991

  Log:
    * string.c (rb_memhash): zero-filled strings should return
      different values.  [ruby-core:33500]

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_string.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29990)
+++ ChangeLog	(revision 29991)
@@ -1,3 +1,8 @@
+Wed Dec  1 14:36:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_memhash): zero-filled strings should return
+	  different values.  [ruby-core:33500]
+
 Wed Dec  1 14:27:49 2010  Ryan Davis  <ryand-ruby@z...>
 
 	* lib/minitest/*.rb: Imported minitest 2.0.0 r5952.
Index: string.c
===================================================================
--- string.c	(revision 29990)
+++ string.c	(revision 29991)
@@ -2073,7 +2073,7 @@
 st_index_t
 rb_memhash(const void *ptr, long len)
 {
-    return st_hash(ptr, len, rb_hash_start(0));
+    return st_hash(ptr, len, rb_hash_start((st_index_t)len));
 }
 
 st_index_t
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 29990)
+++ test/ruby/test_string.rb	(revision 29991)
@@ -727,6 +727,8 @@
   def test_hash
     assert_equal(S("hello").hash, S("hello").hash)
     assert(S("hello").hash != S("helLO").hash)
+    bug4104 = '[ruby-core:33500]'
+    assert_not_equal(S("a").hash, S("a\0").hash, bug4104)
   end
 
   def test_hash_random

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/