diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-25 12:40:17 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-25 12:40:17 +0000 |
commit | 72ea36112ced7623337aead592fe8dbd4d4d1998 (patch) | |
tree | 553cb18e1efe20acc93b258758f46e6ba9dc0ba7 /eval.c | |
parent | c1a432a7d9a9fee1b96c3af9889d86310e2d3ed7 (diff) | |
download | ruby-72ea36112ced7623337aead592fe8dbd4d4d1998.tar.gz |
* eval.c (rb_longjmp): source file information may be NULL.
[ruby-dev:31849]
* eval.c (ruby_finalize_0): clear trace_func before finalization.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -130,6 +130,7 @@ ruby_options(int argc, char **argv) static void ruby_finalize_0(void) { + rb_clear_trace_func(); PUSH_TAG(); if (EXEC_TAG() == 0) { rb_trap_exit(); @@ -143,7 +144,6 @@ ruby_finalize_1(void) { signal(SIGINT, SIG_DFL); GET_THREAD()->errinfo = Qnil; - rb_clear_trace_func(); rb_gc_call_finalizer_at_exit(); } @@ -686,9 +686,16 @@ rb_longjmp(int tag, VALUE mesg) PUSH_TAG(); if ((status = EXEC_TAG()) == 0) { RB_GC_GUARD(e) = rb_obj_as_string(e); - warn_printf("Exception `%s' at %s:%d - %s\n", - rb_obj_classname(th->errinfo), - file, line, RSTRING_PTR(e)); + if (file) { + warn_printf("Exception `%s' at %s:%d - %s\n", + rb_obj_classname(th->errinfo), + file, line, RSTRING_PTR(e)); + } + else { + warn_printf("Exception `%s' - %s\n", + rb_obj_classname(th->errinfo), + RSTRING_PTR(e)); + } } POP_TAG(); if (status == TAG_FATAL && th->errinfo == exception_error) { |