summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-10-16 15:17:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-10-16 15:17:10 +0000
commit7d9c2a6733144e1f10678c59018f540f61d4c6c0 (patch)
tree929c602060f75a983db86db4e642701756f413f8
parent1c7cf852bdcf37bbd7e4faa1424f1c2ad1116f70 (diff)
* eval.c (rb_f_missing): check stack level with rb_stack_check().
* eval.c (rb_call0): ditto. * eval.c, intern.h (rb_stack_check): added. [new] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--eval.c14
-rw-r--r--intern.h1
3 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a85ae340d3..288d6ac995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 16 21:38:15 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * eval.c (rb_f_missing): check stack level with rb_stack_check().
+
+ * eval.c (rb_call0): ditto.
+
+ * eval.c, intern.h (rb_stack_check): added. [new]
+
Tue Oct 16 13:18:47 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* object.c (rb_mod_initialize): optional block with
diff --git a/eval.c b/eval.c
index 628758a93a..bc3a4b1a37 100644
--- a/eval.c
+++ b/eval.c
@@ -4150,6 +4150,8 @@ rb_f_missing(argc, argv, obj)
rb_raise(rb_eArgError, "no id given");
}
+ rb_stack_check();
+
id = SYM2ID(argv[0]);
switch (TYPE(obj)) {
@@ -4282,6 +4284,14 @@ stack_length(p)
#endif
}
+void
+rb_stack_check()
+{
+ if (stack_length(0) > STACK_LEVEL_MAX) {
+ rb_raise(rb_eSysStackError, "stack level too deep");
+ }
+}
+
static VALUE
call_cfunc(func, recv, len, argc, argv)
VALUE (*func)();
@@ -4397,9 +4407,7 @@ rb_call0(klass, recv, id, argc, argv, body, nosuper)
if ((++tick & 0xff) == 0) {
CHECK_INTS; /* better than nothing */
- if (stack_length(0) > STACK_LEVEL_MAX) {
- rb_raise(rb_eSysStackError, "stack level too deep");
- }
+ rb_stack_check();
}
PUSH_ITER(itr);
PUSH_FRAME();
diff --git a/intern.h b/intern.h
index eedbab3da4..dd62aed53a 100644
--- a/intern.h
+++ b/intern.h
@@ -112,6 +112,7 @@ EXTERN int ruby_nerrs;
VALUE rb_exc_new _((VALUE, const char*, long));
VALUE rb_exc_new2 _((VALUE, const char*));
VALUE rb_exc_new3 _((VALUE, VALUE));
+void rb_stack_check _((void));
NORETURN(void rb_loaderror __((const char*, ...)));
NORETURN(void rb_name_error __((VALUE id, const char*, ...)));
void rb_compile_error __((const char*, ...));