mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
c5682ac490
commit
bebb62e01b
2 changed files with 13 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
Wed Jul 13 14:16:03 2016 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
|
* 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 <duerst@it.aoyama.ac.jp>
|
Wed Jul 13 14:15:22 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
|
||||||
|
|
||||||
* enc/windows_1254.c: Adjust variable/macro names.
|
* enc/windows_1254.c: Adjust variable/macro names.
|
||||||
|
|
|
@ -733,17 +733,19 @@ method_entry_get_without_cache(VALUE klass, ID id,
|
||||||
ent->mid = id;
|
ent->mid = id;
|
||||||
|
|
||||||
if (UNDEFINED_METHOD_ENTRY_P(me)) {
|
if (UNDEFINED_METHOD_ENTRY_P(me)) {
|
||||||
ent->me = 0;
|
me = ent->me = NULL;
|
||||||
me = 0;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ent->me = me;
|
ent->me = me;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (UNDEFINED_METHOD_ENTRY_P(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)
|
if (defined_class_ptr)
|
||||||
*defined_class_ptr = defined_class;
|
*defined_class_ptr = defined_class;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue