Added changed check to the mrb_include_module

40f48034 · Corey Powell · Blaž Hrastnik · ce667271 · 40f48034
Commit 40f48034 authored Jul 11, 2015 by Corey Powell Committed by Blaž Hrastnik Jul 13, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

src/class.c src/class.c +4 -1

No files found.
--- a/src/class.c
+++ b/src/class.c
@@ -834,7 +834,10 @@ include_module_at(mrb_state *mrb, struct RClass *klass, struct RClass *c, struct
 MRB_API void
 mrb_include_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
 {
-  include_module_at(mrb, c, c->origin, m, 1);
+  int changed = include_module_at(mrb, c, c->origin, m, 1);
+  if (changed < 0) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "cyclic include detected");
+  }
 }

 MRB_API void