kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Do not allow Module#include to insert modules before the origin in the lookup chain

Browse source 
Module#include should only be able to insert modules after the origin,
otherwise it ends up working like Module#prepend.

This fixes the case where one of the modules in the included module
chain is included in a module that is already prepended to the receiver.

Fixes [Bug #7844]
This commit is contained in:
Jeremy Evans 2019-08-08 09:55:33 -07:00
parent 1f7b557890
commit 08686e71d5
Notes: git 2020-11-21 08:27:24 +09:00
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
class.c
View file

@ -1013,17 +1013,22 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
VALUE original_klass = klass;
while (module) {
int origin_seen = FALSE;
int superclass_seen = FALSE;
struct rb_id_table *tbl;
if (klass == c)
origin_seen = TRUE;
if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
return -1;
/* ignore if the module included already in superclasses */
for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
int type = BUILTIN_TYPE(p);
if (c == p)
origin_seen = TRUE;
if (type == T_ICLASS) {
if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
if (!superclass_seen) {
if (!superclass_seen && origin_seen) {
c = p; /* move insertion point */
}
goto skip;

10
test/ruby/test_module.rb
View file

@ -631,6 +631,16 @@ class TestModule < Test::Unit::TestCase
assert_equal([m1, m2], m3.included_modules)
end
def test_include_with_prepend
c = Class.new{def m; [:c] end}
p = Module.new{def m; [:p] + super end}
q = Module.new{def m; [:q] + super end; include p}
r = Module.new{def m; [:r] + super end; prepend q}
s = Module.new{def m; [:s] + super end; include r}
a = Class.new(c){def m; [:a] + super end; prepend p; include s}
assert_equal([:p, :a, :s, :q, :r, :c], a.new.m)
end
def test_instance_methods
assert_equal([:user, :user2], User.instance_methods(false).sort)
assert_equal([:user, :user2, :mixin].sort, User.instance_methods(true).sort)