1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
shyouhei 2008-07-02 09:58:40 +00:00
parent 13d490723c
commit 77d3b78896
3 changed files with 14 additions and 1 deletions

View file

@ -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.

View file

@ -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");
}

View file

@ -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