From a370556cd289ee8bffaca769328c3d0de0928af2 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 Dec 2013 03:38:22 +0000 Subject: object.c: check const names * object.c (rb_mod_const_get, rb_mod_const_defined): check constant names more strictly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 9b8ca7400b..81c5c5643f 100644 --- a/object.c +++ b/object.c @@ -2134,16 +2134,16 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod) } if (!id) { - if (!ISUPPER(*pbeg) || !rb_enc_symname2_p(pbeg, len, enc)) { - part = rb_str_subseq(name, beglen, len); + part = rb_str_subseq(name, beglen, len); + OBJ_FREEZE(part); + if (!ISUPPER(*pbeg) || !rb_is_const_name(part)) { rb_name_error_str(part, "wrong constant name %"PRIsVALUE, QUOTE(part)); } else if (!rb_method_basic_definition_p(CLASS_OF(mod), id_const_missing)) { - id = rb_intern3(pbeg, len, enc); + id = rb_intern_str(part); } else { - part = rb_str_subseq(name, beglen, len); rb_name_error_str(part, "uninitialized constant %"PRIsVALUE"%"PRIsVALUE, rb_str_subseq(name, 0, beglen), QUOTE(part)); @@ -2271,8 +2271,9 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) } if (!id) { - if (!ISUPPER(*pbeg) || !rb_enc_symname2_p(pbeg, len, enc)) { - part = rb_str_subseq(name, beglen, len); + part = rb_str_subseq(name, beglen, len); + OBJ_FREEZE(part); + if (!ISUPPER(*pbeg) || !rb_is_const_name(part)) { rb_name_error_str(part, "wrong constant name %"PRIsVALUE, QUOTE(part)); } -- cgit v1.2.3