Permalink
Browse files

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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@17692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent df46dc5 commit d4465d1da76beee863eef157ad41117952213717 @shyouhei shyouhei committed Jun 29, 2008
Showing with 7 additions and 1 deletion.
  1. +5 −0 ChangeLog
  2. +1 −0 variable.c
  3. +1 −1 version.h
View
@@ -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
View
@@ -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)) {
View
@@ -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

0 comments on commit d4465d1

Please sign in to comment.