From 2e733be0b2a4f590532a78e4b4539ff539f69d0e Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 21 Feb 2012 07:08:21 +0000 Subject: * proc.c (rb_hash_proc): get wrapped pointer properly. [Bug #6048] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ proc.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc6885b3df..0baf6a082d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 21 16:08:17 2012 Nobuyoshi Nakada + + * proc.c (rb_hash_proc): get wrapped pointer properly. [Bug #6048] + Tue Feb 21 14:41:10 2012 Nobuyoshi Nakada * template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir diff --git a/proc.c b/proc.c index c2859223c5..1ea190c3b3 100644 --- a/proc.c +++ b/proc.c @@ -797,7 +797,8 @@ proc_eq(VALUE self, VALUE other) st_index_t rb_hash_proc(st_index_t hash, VALUE prc) { - const rb_proc_t *proc = (const rb_proc_t *)prc; + rb_proc_t *proc; + GetProcPtr(prc, proc); hash = rb_hash_uint(hash, (st_index_t)proc->block.iseq); hash = rb_hash_uint(hash, (st_index_t)proc->envval); return rb_hash_uint(hash, (st_index_t)proc->block.lfp >> 16); @@ -814,10 +815,8 @@ static VALUE proc_hash(VALUE self) { st_index_t hash; - rb_proc_t *proc; - GetProcPtr(self, proc); hash = rb_hash_start(0); - hash = rb_hash_proc(hash, proc); + hash = rb_hash_proc(hash, self); hash = rb_hash_end(hash); return LONG2FIX(hash); } -- cgit v1.2.3