From b9d74fd1c1ada57b998e567b72e334bfe31efbc1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 14 Dec 2009 03:19:26 +0000 Subject: merge revision(s) 25921: * ext/digest/digest.c (rb_digest_instance_method_unimpl): Do not call rb_inspect() on an object that does not implement necessary methods; reported by NaHi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/digest/digest.c | 17 +++++++++++++---- version.h | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5829195977..5ca2dffac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 14 12:06:39 2009 Akinori MUSHA + + * ext/digest/digest.c (rb_digest_instance_method_unimpl): Do not + call rb_inspect() on an object that does not implement necessary + methods; reported by NaHi. + Mon Dec 14 11:47:31 2009 Nobuyoshi Nakada * eval.c (rb_method_missing): adjusted format and argument number. diff --git a/ext/digest/digest.c b/ext/digest/digest.c index 0b910e8c47..52ec7d7750 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -83,6 +83,15 @@ rb_digest_s_hexencode(VALUE klass, VALUE str) * object to calculate message digest values. */ +static void +rb_digest_instance_method_unimpl(VALUE self, const char *method) +{ + VALUE klass = rb_obj_class(self); + + rb_raise(rb_eRuntimeError, "%s does not implement %s()", + rb_obj_classname(self), method); +} + /* * call-seq: * digest_obj.update(string) -> digest_obj @@ -97,7 +106,7 @@ rb_digest_s_hexencode(VALUE klass, VALUE str) static VALUE rb_digest_instance_update(VALUE self, VALUE str) { - rb_raise(rb_eRuntimeError, "%s does not implement update()", RSTRING_PTR(rb_inspect(self))); + rb_digest_instance_method_unimpl(self, "update"); } /* @@ -115,7 +124,7 @@ rb_digest_instance_update(VALUE self, VALUE str) static VALUE rb_digest_instance_finish(VALUE self) { - rb_raise(rb_eRuntimeError, "%s does not implement finish()", RSTRING_PTR(rb_inspect(self))); + rb_digest_instance_method_unimpl(self, "finish"); } /* @@ -129,7 +138,7 @@ rb_digest_instance_finish(VALUE self) static VALUE rb_digest_instance_reset(VALUE self) { - rb_raise(rb_eRuntimeError, "%s does not implement reset()", RSTRING_PTR(rb_inspect(self))); + rb_digest_instance_method_unimpl(self, "reset"); } /* @@ -358,7 +367,7 @@ rb_digest_instance_length(VALUE self) static VALUE rb_digest_instance_block_length(VALUE self) { - rb_raise(rb_eRuntimeError, "%s does not implement block_length()", RSTRING_PTR(rb_inspect(self))); + rb_digest_instance_method_unimpl(self, "block_length"); } /* diff --git a/version.h b/version.h index ad12db4e23..025f4876f6 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-12-14" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091214 -#define RUBY_PATCHLEVEL 233 +#define RUBY_PATCHLEVEL 234 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3