diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-21 07:24:34 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-21 07:24:34 +0000 |
commit | d5ba54a5e0a065f6f03ca2e3801bccda3a849fd3 (patch) | |
tree | 879161be6b20f97419b57ff9375677bd8627986d | |
parent | 5d43f34a369b2ef579fcf9f8f5824eff4737053b (diff) |
merge revision(s) 35737:
* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
module before calling rb_class2name().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/syslog/syslog.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon May 21 16:24:00 2012 Akinori MUSHA <knu@iDaemons.org> + + * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a + module before calling rb_class2name(). + Sat May 19 14:42:37 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown}: cannot pass SIGTERM diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c index f7d622ef34..d1f75101e4 100644 --- a/ext/syslog/syslog.c +++ b/ext/syslog/syslog.c @@ -315,6 +315,8 @@ static VALUE mSyslog_inspect(VALUE self) { char buf[1024]; + Check_Type(self, T_MODULE); + if (syslog_opened) { snprintf(buf, sizeof(buf), "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>", @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 223 +#define RUBY_PATCHLEVEL 224 -#define RUBY_RELEASE_DATE "2012-05-19" +#define RUBY_RELEASE_DATE "2012-05-21" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" |