Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
e5fb21b6
Commit
e5fb21b6
authored
Jan 17, 2018
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Detect cyclic link of class path references; fix #3926
parent
3ae621fc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
7 deletions
+41
-7
src/variable.c
src/variable.c
+41
-7
No files found.
src/variable.c
View file @
e5fb21b6
...
...
@@ -955,27 +955,61 @@ find_class_sym(mrb_state *mrb, struct RClass *outer, struct RClass *c)
return
arg
.
sym
;
}
static
struct
RClass
*
outer_class
(
mrb_state
*
mrb
,
struct
RClass
*
c
)
{
mrb_value
ov
;
ov
=
mrb_obj_iv_get
(
mrb
,
(
struct
RObject
*
)
c
,
mrb_intern_lit
(
mrb
,
"__outer__"
));
if
(
mrb_nil_p
(
ov
))
return
NULL
;
switch
(
mrb_type
(
ov
))
{
case
MRB_TT_CLASS
:
case
MRB_TT_MODULE
:
return
mrb_class_ptr
(
ov
);
default:
break
;
}
return
NULL
;
}
static
mrb_bool
detect_outer_loop
(
mrb_state
*
mrb
,
struct
RClass
*
c
)
{
struct
RClass
*
t
=
c
;
/* tortoise */
struct
RClass
*
h
=
c
;
/* hare */
for
(;;)
{
if
(
h
==
NULL
)
return
FALSE
;
h
=
outer_class
(
mrb
,
h
);
if
(
h
==
NULL
)
return
FALSE
;
h
=
outer_class
(
mrb
,
h
);
t
=
outer_class
(
mrb
,
t
);
if
(
t
==
h
)
return
TRUE
;
}
}
mrb_value
mrb_class_find_path
(
mrb_state
*
mrb
,
struct
RClass
*
c
)
{
mrb_value
outer
,
path
;
struct
RClass
*
outer
;
mrb_value
path
;
mrb_sym
name
;
const
char
*
str
;
mrb_int
len
;
mrb_sym
osym
=
mrb_intern_lit
(
mrb
,
"__outer__"
);
outer
=
mrb_obj_iv_get
(
mrb
,
(
struct
RObject
*
)
c
,
osym
);
if
(
mrb_nil_p
(
outer
))
return
outer
;
name
=
find_class_sym
(
mrb
,
mrb_class_ptr
(
outer
),
c
);
if
(
detect_outer_loop
(
mrb
,
c
))
return
mrb_nil_value
();
outer
=
outer_class
(
mrb
,
c
);
if
(
outer
==
NULL
)
return
mrb_nil_value
();
name
=
find_class_sym
(
mrb
,
outer
,
c
);
if
(
name
==
0
)
return
mrb_nil_value
();
str
=
mrb_class_name
(
mrb
,
mrb_class_ptr
(
outer
)
);
str
=
mrb_class_name
(
mrb
,
outer
);
path
=
mrb_str_new_capa
(
mrb
,
40
);
mrb_str_cat_cstr
(
mrb
,
path
,
str
);
mrb_str_cat_cstr
(
mrb
,
path
,
"::"
);
str
=
mrb_sym2name_len
(
mrb
,
name
,
&
len
);
mrb_str_cat
(
mrb
,
path
,
str
,
len
);
iv_del
(
mrb
,
c
->
iv
,
osym
,
NULL
);
iv_del
(
mrb
,
c
->
iv
,
mrb_intern_lit
(
mrb
,
"__outer__"
)
,
NULL
);
iv_put
(
mrb
,
c
->
iv
,
mrb_intern_lit
(
mrb
,
"__classname__"
),
path
);
mrb_field_write_barrier_value
(
mrb
,
(
struct
RBasic
*
)
c
,
path
);
return
path
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment