1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ruby.c (process_options): set safe_level before loading script.

Browse Source 
[ruby-dev:34421]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-04-24 08:20:56 +00:00
parent 86bab63d23
commit ae6782315a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Apr 24 17:19:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (process_options): set safe_level before loading script.
[ruby-dev:34421]
Thu Apr 24 14:15:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 24 14:15:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (dln_find_1): prior files with extensions to files sans * dln.c (dln_find_1): prior files with extensions to files sans

2
ruby.c
View File

@ -1073,6 +1073,7 @@ process_options(VALUE arg)
} }
rb_enc_set_default_external(rb_enc_from_encoding(enc)); rb_enc_set_default_external(rb_enc_from_encoding(enc));
rb_set_safe_level_force(safe);
if (opt->e_script) { if (opt->e_script) {
rb_encoding *eenc; rb_encoding *eenc;
if (opt->src.enc.index >= 0) { if (opt->src.enc.index >= 0) {
@ -1091,7 +1092,6 @@ process_options(VALUE arg)
} }
tree = load_file(parser, opt->script, 1, opt); tree = load_file(parser, opt->script, 1, opt);
} }
rb_set_safe_level_force(safe);
if (!tree) return Qfalse; if (!tree) return Qfalse;

2
version.h
View File

@ -50,7 +50,7 @@ RUBY_EXTERN const char ruby_copyright[];
RUBY_RELEASE_STR" " \ RUBY_RELEASE_STR" " \
STRINGIZE(RUBY_RELEASE_NUM)") " \ STRINGIZE(RUBY_RELEASE_NUM)") " \
"["RUBY_PLATFORM"]" "["RUBY_PLATFORM"]"
# define RUBY_COPYRIGHT \ # define RUBY_COPYRIGHT \
"ruby - Copyright (C) " \ "ruby - Copyright (C) " \
STRINGIZE(RUBY_BIRTH_YEAR)"-" \ STRINGIZE(RUBY_BIRTH_YEAR)"-" \
STRINGIZE(RUBY_RELEASE_YEAR)" " \ STRINGIZE(RUBY_RELEASE_YEAR)" " \