* error.c (rb_exc_new3): keeps the given string itself.
* eval.c (Init_Proc), gc.c (Init_GC): freeze messages of preallocated special exceptions also. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a9d25a31ee
commit
86c58b7813
|
@ -1,3 +1,10 @@
|
||||||
|
Thu Jul 3 07:03:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* error.c (rb_exc_new3): keeps the given string itself.
|
||||||
|
|
||||||
|
* eval.c (Init_Proc), gc.c (Init_GC): freeze messages of preallocated
|
||||||
|
special exceptions also.
|
||||||
|
|
||||||
Thu Jul 3 06:17:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Jul 3 06:17:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
|
* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
|
||||||
|
|
2
error.c
2
error.c
|
@ -333,7 +333,7 @@ rb_exc_new3(etype, str)
|
||||||
VALUE etype, str;
|
VALUE etype, str;
|
||||||
{
|
{
|
||||||
StringValue(str);
|
StringValue(str);
|
||||||
return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
|
return rb_funcall(etype, rb_intern("new"), 1, str);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
6
eval.c
6
eval.c
|
@ -9992,13 +9992,15 @@ Init_Proc()
|
||||||
rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
|
rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
|
||||||
|
|
||||||
rb_global_variable(&exception_error);
|
rb_global_variable(&exception_error);
|
||||||
exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
|
exception_error = rb_exc_new3(rb_eFatal,
|
||||||
|
rb_obj_freeze(rb_str_new2("exception reentered")));
|
||||||
OBJ_TAINT(exception_error);
|
OBJ_TAINT(exception_error);
|
||||||
OBJ_FREEZE(exception_error);
|
OBJ_FREEZE(exception_error);
|
||||||
|
|
||||||
rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
|
rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
|
||||||
rb_global_variable(&sysstack_error);
|
rb_global_variable(&sysstack_error);
|
||||||
sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
|
sysstack_error = rb_exc_new3(rb_eSysStackError,
|
||||||
|
rb_obj_freeze(rb_str_new2("stack level too deep")));
|
||||||
OBJ_TAINT(sysstack_error);
|
OBJ_TAINT(sysstack_error);
|
||||||
OBJ_FREEZE(sysstack_error);
|
OBJ_FREEZE(sysstack_error);
|
||||||
|
|
||||||
|
|
3
gc.c
3
gc.c
|
@ -2125,7 +2125,8 @@ Init_GC()
|
||||||
source_filenames = st_init_strtable();
|
source_filenames = st_init_strtable();
|
||||||
|
|
||||||
rb_global_variable(&nomem_error);
|
rb_global_variable(&nomem_error);
|
||||||
nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
|
nomem_error = rb_exc_new3(rb_eNoMemError,
|
||||||
|
rb_obj_freeze(rb_str_new2"failed to allocate memory"));
|
||||||
OBJ_TAINT(nomem_error);
|
OBJ_TAINT(nomem_error);
|
||||||
OBJ_FREEZE(nomem_error);
|
OBJ_FREEZE(nomem_error);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue