From c3584dfacce4d0f2058d8403de6fdce4fd4d686b Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Sat, 7 Mar 2020 03:55:54 +0900 Subject: [PATCH] check ar_table first. RHASH_AR_TABLE_SIZE() has assertion that it is a ar_talbe. The last commit breaks this assumption so check ar_table first. --- hash.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hash.c b/hash.c index ea763c239c..4477ab5853 100644 --- a/hash.c +++ b/hash.c @@ -763,11 +763,14 @@ ar_free_and_clear_table(VALUE hash) static void ar_try_convert_table(VALUE hash) { - st_table *new_tab; + if (!RHASH_AR_TABLE_P(hash)) return; + const unsigned size = RHASH_AR_TABLE_SIZE(hash); + + st_table *new_tab; st_index_t i; - if (!RHASH_AR_TABLE_P(hash) || size < RHASH_AR_TABLE_MAX_SIZE) { + if (size < RHASH_AR_TABLE_MAX_SIZE) { return; }