shyouhei	2008-06-29 18:28:00 +0900 (Sun, 29 Jun 2008)

  New Revision: 17692

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/variable.c
    branches/ruby_1_8_7/version.h

  Log:
    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>.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/variable.c?r1=17692&r2=17691&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17692&r2=17691&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17692&r2=17691&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17691)
+++ ruby_1_8_7/ChangeLog	(revision 17692)
@@ -1,3 +1,8 @@
+Sun Jun 29 18:26:01 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
Index: ruby_1_8_7/variable.c
===================================================================
--- ruby_1_8_7/variable.c	(revision 17691)
+++ ruby_1_8_7/variable.c	(revision 17692)
@@ -647,6 +647,7 @@
     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)) {
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17691)
+++ ruby_1_8_7/version.h	(revision 17692)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/