nagachika	2013-06-05 00:05:58 +0900 (Wed, 05 Jun 2013)

  New Revision: 41067

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41067

  Log:
    merge revision(s) 40920: [Backport #8450]
    
    * string.c (rb_str_quote_unprintable): check if argument is a string.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/string.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41066)
+++ ruby_2_0_0/ChangeLog	(revision 41067)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Jun  5 00:04:12 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_quote_unprintable): check if argument is a string.
+
 Tue Jun  4 23:42:18 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (loaded_feature_path): fix invalid read by index underflow.
Index: ruby_2_0_0/string.c
===================================================================
--- ruby_2_0_0/string.c	(revision 41066)
+++ ruby_2_0_0/string.c	(revision 41067)
@@ -7822,8 +7822,10 @@ rb_str_quote_unprintable(VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/string.c#L7822
     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);
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41066)
+++ ruby_2_0_0/version.h	(revision 41067)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40920


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/