3 files changed, 17 insertions, 11 deletions
@@ -1,4 +1,7 @@
-Sun Jun 19 10:54:40 2016 Nobuyoshi Nakada <[email protected]>
 * variable.c (rb_path_to_class): search the constant at once
 instead of checking if defined and then getting it.
@@ -719,10 +719,12 @@ class TestMarshal < Test::Unit::TestCase
 end
 def test_marshal_load_extended_class_crash
- crash = "\x04\be:\x0F\x00omparableo:\vObject\x00"
-
- opt = %w[--disable=gems]
- assert_ruby_status(opt, "Marshal.load(#{crash.dump})")
 end
 def test_marshal_load_r_prepare_reference_crash
@@ -389,7 +389,7 @@ VALUE
 rb_path_to_class(VALUE pathname)
 {
 rb_encoding *enc = rb_enc_get(pathname);
- const char *pbeg, *p, *path = RSTRING_PTR(pathname);
 ID id;
 VALUE c = rb_cObject;
@@ -397,15 +397,16 @@ rb_path_to_class(VALUE pathname)
 rb_raise(rb_eArgError, "invalid class path encoding (non ASCII)");
 }
 pbeg = p = path;
- if (path[0] == '#') {
 rb_raise(rb_eArgError, "can't retrieve anonymous class %"PRIsVALUE,
 QUOTE(pathname));
 }
- while (*p) {
-	while (*p && *p != ':') p++;
 id = rb_check_id_cstr(pbeg, p-pbeg, enc);
-	if (p[0] == ':') {
- if (p[1] != ':') goto undefined_class;
 p += 2;
 pbeg = p;
 }