From 72ea36112ced7623337aead592fe8dbd4d4d1998 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 25 Sep 2007 12:40:17 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 +++++++ eval.c | 15 +++++++++++---- version.h | 6 +++--- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 605d580216..c5316ba256 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 25 09:51:31 2007 Yukihiro Matsumoto + + * eval.c (rb_longjmp): source file information may be NULL. + [ruby-dev:31849] + + * eval.c (ruby_finalize_0): clear trace_func before finalization. + Mon Sep 24 22:36:13 2007 Yukihiro Matsumoto * array.c (rb_ary_equal): should handle recursive array. diff --git a/eval.c b/eval.c index 655f2c41f8..4ad528819b 100644 --- a/eval.c +++ b/eval.c @@ -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) { diff --git a/version.h b/version.h index 523804d262..d1bf7e1739 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-09-24" +#define RUBY_RELEASE_DATE "2007-09-25" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070924 +#define RUBY_RELEASE_CODE 20070925 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];