shyouhei	2008-07-02 18:56:56 +0900 (Wed, 02 Jul 2008)

  New Revision: 17807

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/syslog/syslog.c
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 17727:
    * ext/syslog/syslog.c (syslog_write): syslog operations should be
      protected from $SAFE level 4.  a patch from Keita Yamaguchi
      <keita.yamaguchi at gmail.com>.
    * ext/syslog/syslog.c (mSyslog_close): ditto.
    * ext/syslog/syslog.c (mSyslog_set_mask): ditto.



  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17807

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17807&r2=17806&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17807&r2=17806&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/syslog/syslog.c?r1=17807&r2=17806&diff_format=u

Index: ruby_1_8_6/ext/syslog/syslog.c
===================================================================
--- ruby_1_8_6/ext/syslog/syslog.c	(revision 17806)
+++ ruby_1_8_6/ext/syslog/syslog.c	(revision 17807)
@@ -22,6 +22,7 @@
 {
     VALUE str;
 
+    rb_secure(4);
     if (argc < 1) {
         rb_raise(rb_eArgError, "no log message supplied");
     }
@@ -38,6 +39,7 @@
 /* Syslog module methods */
 static VALUE mSyslog_close(VALUE self)
 {
+    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "syslog not opened");
     }
@@ -132,6 +134,7 @@
 
 static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
 {
+    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
     }
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17806)
+++ ruby_1_8_6/ChangeLog	(revision 17807)
@@ -1,3 +1,13 @@
+Wed Jul  2 18:55:50 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/syslog/syslog.c (syslog_write): syslog operations should be
+	  protected from $SAFE level 4.  a patch from Keita Yamaguchi
+	  <keita.yamaguchi at gmail.com>.
+
+	* ext/syslog/syslog.c (mSyslog_close): ditto.
+
+	* ext/syslog/syslog.c (mSyslog_set_mask): ditto.
+
 Wed Jul  2 18:25:17 2008  Tanaka Akira  <akr@f...>
 
 	* math.c (domain_check): fix preprocess condition.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17806)
+++ ruby_1_8_6/version.h	(revision 17807)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-02"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080702
-#define RUBY_PATCHLEVEL 261
+#define RUBY_PATCHLEVEL 262
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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