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

Add assertion in RHASH_AR_TABLE_BOUND

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-08-03 02:02:47 +09:00
parent fe977314d5
commit 8f2bbbbcaf
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hash.c
View File

@ -461,14 +461,20 @@ ar_set_entry(VALUE hash, unsigned int index, st_data_t key, st_data_t val, st_ha
((unsigned int)((RBASIC(h)->flags >> RHASH_AR_TABLE_BOUND_SHIFT) & \ ((unsigned int)((RBASIC(h)->flags >> RHASH_AR_TABLE_BOUND_SHIFT) & \
(RHASH_AR_TABLE_BOUND_MASK >> RHASH_AR_TABLE_BOUND_SHIFT))) (RHASH_AR_TABLE_BOUND_MASK >> RHASH_AR_TABLE_BOUND_SHIFT)))
#define RHASH_AR_TABLE_BOUND(h) (HASH_ASSERT(RHASH_AR_TABLE_P(h)), \
RHASH_AR_TABLE_BOUND_RAW(h))
#define RHASH_ST_TABLE_SET(h, s) rb_hash_st_table_set(h, s) #define RHASH_ST_TABLE_SET(h, s) rb_hash_st_table_set(h, s)
#define RHASH_TYPE(hash) (RHASH_AR_TABLE_P(hash) ? &objhash : RHASH_ST_TABLE(hash)->type) #define RHASH_TYPE(hash) (RHASH_AR_TABLE_P(hash) ? &objhash : RHASH_ST_TABLE(hash)->type)
#define HASH_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(HASH_DEBUG, expr, #expr) #define HASH_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(HASH_DEBUG, expr, #expr)
static inline unsigned int
RHASH_AR_TABLE_BOUND(VALUE h)
{
HASH_ASSERT(RHASH_AR_TABLE_P(h));
const unsigned int bound = RHASH_AR_TABLE_BOUND_RAW(h);
HASH_ASSERT(bound <= RHASH_AR_TABLE_MAX_SIZE);
return bound;
}
#if HASH_DEBUG #if HASH_DEBUG
#define hash_verify(hash) hash_verify_(hash, __FILE__, __LINE__) #define hash_verify(hash) hash_verify_(hash, __FILE__, __LINE__)
@ -481,7 +487,7 @@ rb_hash_dump(VALUE hash)
unsigned i, n = 0, bound = RHASH_AR_TABLE_BOUND(hash); unsigned i, n = 0, bound = RHASH_AR_TABLE_BOUND(hash);
fprintf(stderr, " size:%u bound:%u\n", fprintf(stderr, " size:%u bound:%u\n",
RHASH_AR_TABLE_SIZE(hash), RHASH_AR_TABLE_BOUND(hash)); RHASH_AR_TABLE_SIZE(hash), bound);
for (i=0; i<bound; i++) { for (i=0; i<bound; i++) {
st_data_t k, v; st_data_t k, v;