From bebb62e01b6d752756c8cb51794119c490cde77c Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 13 Jul 2016 05:19:12 +0000 Subject: * vm_method.c (method_entry_get_without_cache): check undefined method even if ruby_running is FALSE. We haven't call "undef"ed methods before ruby_running. So that this issue does not make troubles. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ vm_method.c | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e60a717480..158df4f231 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jul 13 14:16:03 2016 Koichi Sasada + + * vm_method.c (method_entry_get_without_cache): check + undefined method even if ruby_running is FALSE. + + We haven't call "undef"ed methods before ruby_running. + So that this issue does not make troubles. + Wed Jul 13 14:15:22 2016 Martin Duerst * enc/windows_1254.c: Adjust variable/macro names. diff --git a/vm_method.c b/vm_method.c index 96fc4b6855..69f98c4421 100644 --- a/vm_method.c +++ b/vm_method.c @@ -733,17 +733,19 @@ method_entry_get_without_cache(VALUE klass, ID id, ent->mid = id; if (UNDEFINED_METHOD_ENTRY_P(me)) { - ent->me = 0; - me = 0; + me = ent->me = NULL; } else { ent->me = me; } } else if (UNDEFINED_METHOD_ENTRY_P(me)) { - me = 0; + me = NULL; } } + else if (UNDEFINED_METHOD_ENTRY_P(me)) { + me = NULL; + } if (defined_class_ptr) *defined_class_ptr = defined_class; -- cgit v1.2.3