diff options
| -rw-r--r-- | gc.c | 2 | ||||
| -rw-r--r-- | internal/symbol.h | 1 | ||||
| -rw-r--r-- | symbol.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_objectspace.rb | 5 |
4 files changed, 13 insertions, 1 deletions
@@ -4652,7 +4652,7 @@ id2ref(VALUE objid) if ((ptr % sizeof(RVALUE)) == (4 << 2)) { ID symid = ptr / sizeof(RVALUE); p0 = (void *)ptr; - if (rb_id2str(symid) == 0) + if (!rb_static_id_valid_p(symid)) rb_raise(rb_eRangeError, "%p is not symbol id value", p0); return ID2SYM(symid); } diff --git a/internal/symbol.h b/internal/symbol.h index 4f041330f9..30c81ea004 100644 --- a/internal/symbol.h +++ b/internal/symbol.h @@ -30,6 +30,7 @@ PUREFUNC(int rb_is_attrset_sym(VALUE sym)); ID rb_make_internal_id(void); ID rb_make_temporary_id(size_t n); void rb_gc_free_dsymbol(VALUE); +int rb_static_id_valid_p(ID id); #if __has_builtin(__builtin_constant_p) #define rb_sym_intern_ascii_cstr(ptr) \ @@ -481,6 +481,12 @@ get_id_entry(ID id, const enum id_entry_type t) return get_id_serial_entry(rb_id_to_serial(id), id, t); } +int +rb_static_id_valid_p(ID id) +{ + return STATIC_ID2SYM(id) == get_id_entry(id, ID_ENTRY_SYM); +} + static inline ID rb_id_serial_to_id(rb_id_serial_t num) { diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb index e0f9eecd11..3c912fe300 100644 --- a/test/ruby/test_objectspace.rb +++ b/test/ruby/test_objectspace.rb @@ -65,6 +65,11 @@ End assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(Object.new)} end + def test_id2ref_invalid_symbol_id + msg = /is not symbol id value/ + assert_raise_with_message(RangeError, msg) { ObjectSpace._id2ref(:a.object_id + 40) } + end + def test_count_objects h = {} ObjectSpace.count_objects(h) |