From bd9b31e557ca557aa2ae8b5908c71e1250e450c8 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 7 Nov 2012 00:16:03 +0000 Subject: object.c: inadvertent symbol * object.c (rb_mod_const_get): avoid inadvertent symbol creation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 89706dd9e7..4d4daaf006 100644 --- a/object.c +++ b/object.c @@ -1947,13 +1947,21 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod) } while (*p) { + VALUE part; + while (*p && *p != ':') p++; if (pbeg == p) { rb_raise(rb_eNameError, "wrong constant name %s", path); } - id = rb_intern3(pbeg, p-pbeg, enc); + id = rb_check_id_cstr(pbeg, p-pbeg, enc); + if (id) { + part = ID2SYM(id); + } + else { + part = rb_str_subseq(name, pbeg-path, p-pbeg); + } if (p[0] == ':') { if (p[1] != ':') { rb_raise(rb_eNameError, "wrong constant name %s", path); @@ -1966,7 +1974,7 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod) rb_raise(rb_eTypeError, "%s does not refer to class/module", path); } - mod = rb_mod_single_const_get(mod, ID2SYM(id), recur); + mod = rb_mod_single_const_get(mod, part, recur); } return mod; -- cgit v1.2.3