diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/digest/digest.c | 4 | ||||
| -rwxr-xr-x | test/digest/test_digest.rb | 3 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Jun 7 06:03:11 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. + Fri Jun 6 22:19:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (private_recv_p): check by node type, instead of a diff --git a/ext/digest/digest.c b/ext/digest/digest.c index 527d0ed1fe..8a53bd2b00 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -370,9 +370,11 @@ rb_digest_instance_equal(VALUE self, VALUE other) if (rb_obj_is_kind_of(other, rb_mDigest_Instance) == Qtrue) { str1 = rb_digest_instance_digest(0, 0, self); str2 = rb_digest_instance_digest(0, 0, other); - } else { + } else if (!NIL_P(rb_check_string_type(other))) { str1 = rb_digest_instance_to_s(self); str2 = other; + } else { + 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 86f9147428..cf541a4626 100755 --- a/test/digest/test_digest.rb +++ b/test/digest/test_digest.rb @@ -69,6 +69,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" |