merge revision(s) 40920: [Backport #8450]

	* string.c (rb_str_quote_unprintable): check if argument is a string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index fb938e1476..2f73d044e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  5 00:04:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_quote_unprintable): check if argument is a string.
+
 Tue Jun  4 23:42:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* load.c (loaded_feature_path): fix invalid read by index underflow.
diff --git a/string.c b/string.c
index 1b7d2f8639..9d7816c22d 100644
--- a/string.c
+++ b/string.c
@@ -7822,8 +7822,10 @@ rb_str_quote_unprintable(VALUE str)
     rb_encoding *enc;
     const char *ptr;
     long len;
-    rb_encoding *resenc = rb_default_internal_encoding();
+    rb_encoding *resenc;
 
+    Check_Type(str, T_STRING);
+    resenc = rb_default_internal_encoding();
     if (resenc == NULL) resenc = rb_default_external_encoding();
     enc = STR_ENC_GET(str);
     ptr = RSTRING_PTR(str);
diff --git a/version.h b/version.h
index 0029784508..419f814c2e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-04"
-#define RUBY_PATCHLEVEL 204
+#define RUBY_RELEASE_DATE "2013-06-05"
+#define RUBY_PATCHLEVEL 205
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"