nagachika	2018-10-09 22:59:53 +0900 (Tue, 09 Oct 2018)

  New Revision: 64978

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64978

  Log:
    merge revision(s) 64915: [Backport #15205]
    
    check argument type.
    
    * iseq.c (iseqw_s_compile): check argument type (T_STRING) to
      avoid SEGV.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/iseq.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/iseq.c
===================================================================
--- ruby_2_5/iseq.c	(revision 64977)
+++ ruby_2_5/iseq.c	(revision 64978)
@@ -861,9 +861,14 @@ iseqw_s_compile(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/ruby_2_5/iseq.c#L861
       case 3: path = argv[--i];
       case 2: file = argv[--i];
     }
+
     if (NIL_P(file)) file = rb_fstring_cstr("<compiled>");
+    if (NIL_P(path)) path = file;
     if (NIL_P(line)) line = INT2FIX(1);
 
+    Check_Type(path, T_STRING);
+    Check_Type(file, T_STRING);
+
     return iseqw_new(rb_iseq_compile_with_option(src, file, path, line, 0, opt));
 }
 
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 64977)
+++ ruby_2_5/version.h	(revision 64978)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.2"
-#define RUBY_RELEASE_DATE "2018-10-01"
-#define RUBY_PATCHLEVEL 91
+#define RUBY_RELEASE_DATE "2018-10-09"
+#define RUBY_PATCHLEVEL 92
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 64977)
+++ ruby_2_5	(revision 64978)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r64915

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