1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use internal_id.

Browse Source 
"hash_iter_lev" can be exported by Marshal.dump and it will
introduce inconsistency. To avoid this issue, use internal_id
instead of normal ID. This issue is pointed out by Chikanaga-san.
This commit is contained in:
Koichi Sasada 2019-08-01 11:20:37 +09:00
parent 67f7e5a224
commit 7463867106
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hash.c
View File

@ -90,6 +90,7 @@ VALUE rb_cHash;
static VALUE envtbl; static VALUE envtbl;
static ID id_hash, id_yield, id_default, id_flatten_bang; static ID id_hash, id_yield, id_default, id_flatten_bang;
static ID id_hash_iter_lev;
VALUE VALUE
rb_hash_set_ifnone(VALUE hash, VALUE ifnone) rb_hash_set_ifnone(VALUE hash, VALUE ifnone)
@ -1313,7 +1314,7 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
static int static int
iter_lev_in_ivar(VALUE hash) iter_lev_in_ivar(VALUE hash)
{ {
VALUE levval = rb_ivar_get(hash, rb_intern("hash_iter_lev")); VALUE levval = rb_ivar_get(hash, id_hash_iter_lev);
HASH_ASSERT(FIXNUM_P(levval)); HASH_ASSERT(FIXNUM_P(levval));
return FIX2INT(levval); return FIX2INT(levval);
} }
@ -1323,7 +1324,7 @@ void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
static void static void
iter_lev_in_ivar_set(VALUE hash, int lev) iter_lev_in_ivar_set(VALUE hash, int lev)
{ {
rb_ivar_set_internal(hash, rb_intern("hash_iter_lev"), INT2FIX(lev)); rb_ivar_set_internal(hash, id_hash_iter_lev, INT2FIX(lev));
} }
static int static int
@ -6048,6 +6049,7 @@ Init_Hash(void)
id_yield = rb_intern("yield"); id_yield = rb_intern("yield");
id_default = rb_intern("default"); id_default = rb_intern("default");
id_flatten_bang = rb_intern("flatten!"); id_flatten_bang = rb_intern("flatten!");
id_hash_iter_lev = rb_make_internal_id();
rb_cHash = rb_define_class("Hash", rb_cObject); rb_cHash = rb_define_class("Hash", rb_cObject);