summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/syslog/syslog.c2
-rw-r--r--version.h6
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e9eb2f593..2e4b9e8ed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>",
diff --git a/version.h b/version.h
index d5464a6a02..3d41af589e 100644
--- a/version.h
+++ b/version.h
@@ -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"