diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:11:29 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:11:29 +0000 |
commit | a102b685b93f0ce944c273e24f7d100e85777426 (patch) | |
tree | 882079486f52e2391afffcc099ec2d4f333bc698 | |
parent | bea02d1b35a389cd70f349183776cc96be29abc2 (diff) |
merge revision(s) 46368,46371: [Backport #9913]
* ext/digest/digest.c (rb_digest_instance_equal):
fix #== for non-string arguments. [ruby-core:62967] [Bug #9913]
* test/digest/test_digest.rb: add test for above.
* ext/digest/digest.c (rb_digest_instance_equal): no need to call
`to_s` twice. [Bug #9913]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | ext/digest/digest.c | 3 | ||||
-rwxr-xr-x | test/digest/test_digest.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,15 @@ +Sun Aug 31 16:10:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/digest/digest.c (rb_digest_instance_equal): no need to call + `to_s` twice. [Bug #9913] + +Sun Aug 31 16:10:30 2014 Benoit Daloze <eregontp@gmail.com> + + * ext/digest/digest.c (rb_digest_instance_equal): + fix #== for non-string arguments. [ruby-core:62967] [Bug #9913] + + * test/digest/test_digest.rb: add test for above. + Sun Aug 31 15:46:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (yield_indexed_values): extract from permute0(), diff --git a/ext/digest/digest.c b/ext/digest/digest.c index c603441409..02fc12bd63 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -356,7 +356,8 @@ rb_digest_instance_equal(VALUE self, VALUE other) str2 = rb_digest_instance_digest(0, 0, other); } else { str1 = rb_digest_instance_to_s(self); - str2 = other; + str2 = rb_check_string_type(other); + if (NIL_P(str2)) return Qfalse; } /* never blindly assume that subclass methods return strings */ diff --git a/test/digest/test_digest.rb b/test/digest/test_digest.rb index 4b1d55e256..7c990d4320 100755 --- a/test/digest/test_digest.rb +++ b/test/digest/test_digest.rb @@ -68,6 +68,9 @@ module TestDigest assert_equal(md1, md1.clone, self.class::ALGO) + bug9913 = '[ruby-core:62967] [Bug #9913]' + assert_not_equal(md1, nil, bug9913) + md2 = self.class::ALGO.new md2 << "A" @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-08-31" -#define RUBY_PATCHLEVEL 533 +#define RUBY_PATCHLEVEL 534 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 8 |