From 77d3b78896d2e4e2da7db63ec0c81dcad0d30b0f Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 2 Jul 2008 09:58:40 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 10 ++++++++++
 ext/syslog/syslog.c |  3 +++
 version.h           |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 61f60ee065..6b615bd5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jul  2 18:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* 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:26:20 2008  Tanaka Akira  <akr@fsij.org>
 
 	* math.c (domain_check): fix preprocess condition.
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 477489ddfe..ecc49318f7 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -22,6 +22,7 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 {
     VALUE str;
 
+    rb_secure(4);
     if (argc < 1) {
         rb_raise(rb_eArgError, "no log message supplied");
     }
@@ -38,6 +39,7 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 /* 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_get_mask(VALUE self)
 
 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");
     }
diff --git a/version.h b/version.h
index 48a13938d3..7e93ce7ecb 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-02"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080702
-#define RUBY_PATCHLEVEL 43
+#define RUBY_PATCHLEVEL 44
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8