summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 09:25:35 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 09:25:35 (GMT)
commit7e376bdfeb23155072c71365a70928177d7c8453 (patch)
treef483871db7c5ec56f97c1727f165207fba3a00e4
parent526a28d851ba4ec2ab8e5c2321af43cda2dd1d7f (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_6@17690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--variable.c1
-rw-r--r--version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 92e2f36..6567a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 18:25:03 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:24:13 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 e00f1ef..7e548c3 100644
--- a/variable.c
+++ b/variable.c
@@ -642,6 +642,7 @@ rb_f_untrace_var(argc, argv)
struct global_entry *entry;
struct trace_var *trace;
+ rb_secure(4);
rb_scan_args(argc, argv, "11", &var, &cmd);
id = rb_to_id(var);
if (!st_lookup(rb_global_tbl, id, (st_data_t *)&entry)) {
diff --git a/version.h b/version.h
index 7f03df2..402fd74 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-29"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 248
+#define RUBY_PATCHLEVEL 249
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8