diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 09:28:00 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 09:28:00 +0000 |
commit | 5caedd1cb08e40fa12301105b1117e6254c33948 (patch) | |
tree | 3bdb888f1ab0c310842041c2f40f3d65c279f6cc | |
parent | ada89912d72109cb547b181b7ad28ff4e175cc97 (diff) |
merge revision(s) 17578:
* variable.c (rb_f_trace_var): should not be allowed at safe level 4.
a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | variable.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Jun 29 18:26:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * variable.c (rb_f_trace_var): should not be allowed at safe level 4. + a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>. + Sun Jun 29 18:22:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (rb_ary_fill): not depend on unspecified behavior at integer diff --git a/variable.c b/variable.c index fbb011759d..ed5bd845b8 100644 --- a/variable.c +++ b/variable.c @@ -647,6 +647,7 @@ rb_f_untrace_var(argc, argv) struct trace_var *trace; st_data_t data; + rb_secure(4); rb_scan_args(argc, argv, "11", &var, &cmd); id = rb_to_id(var); if (!st_lookup(rb_global_tbl, id, &data)) { @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 31 +#define RUBY_PATCHLEVEL 32 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |