diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 09:56:56 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 09:56:56 +0000 |
commit | 13b7f4c7543997f809fd41c8aafb88d2d00fb111 (patch) | |
tree | 90604c49cc021d9d7213323cab0b46bd6229b14a | |
parent | 66be7ca4ecadc34b25344ea2b2f4f4853a3efb60 (diff) | |
download | ruby-13b7f4c7543997f809fd41c8aafb88d2d00fb111.tar.gz ruby-13b7f4c7543997f809fd41c8aafb88d2d00fb111.tar.xz ruby-13b7f4c7543997f809fd41c8aafb88d2d00fb111.zip |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ext/syslog/syslog.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Wed Jul 2 18:55:50 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:25:17 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 477489ddf..ecc49318f 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"); } @@ -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 |