From 76a929a7fca3c84630574e4daa9dab7a96b04fc8 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 9 Jul 2014 06:14:41 +0000 Subject: * parse.y: change Symbol <-> ID relationship to avoid exposing IDs from collectable symbols. [Bug #10014] Now, rb_check_id() returns 0 if corresponding symbol is pinned dynamic symbol. There is remaining intern_cstr_without_pindown(), it can return IDs from collectable symbols. We must be careful to use it (only used in parse.y). I think it should be removed if it does not have impact for performance. * parse.y: add: * STATIC_SYM2ID() * STATIC_ID2SYM() rename: * rb_pin_dynamic_symbol() -> dsymbol_pindown() * internal.h: remove: * rb_check_id_without_pindown() * rb_sym2id_without_pindown() add: * rb_check_symbol() * rb_check_symbol_cstr() * load.c: use rb_check_id() or rb_check_id_cstr(). * object.c: ditto. * struct.c: ditto. * thread.c: ditto. * vm_method.c: ditto. * string.c (sym_find): use only rb_check_symbol(). * sprintf.c (rb_str_format): use rb_check_symbol_cstr(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- internal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal.h') diff --git a/internal.h b/internal.h index 45b9eff0db..e3ab0dec8b 100644 --- a/internal.h +++ b/internal.h @@ -809,12 +809,12 @@ void rb_gc_mark_symbols(int full_mark); ID rb_make_internal_id(void); void rb_gc_free_dsymbol(VALUE); VALUE rb_str_dynamic_intern(VALUE); -ID rb_check_id_without_pindown(VALUE *); -ID rb_sym2id_without_pindown(VALUE); +ID rb_id_attrget(ID id); + +VALUE rb_check_symbol(volatile VALUE *namep); #ifdef RUBY_ENCODING_H -ID rb_check_id_cstr_without_pindown(const char *, long, rb_encoding *); +VALUE rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc); #endif -ID rb_id_attrget(ID id); /* proc.c */ VALUE rb_proc_location(VALUE self); -- cgit v1.2.3