diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | id_table.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Aug 27 03:51:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * id_table.c (hash_table_extend): should not shrink the table than + the previous capacity. [ruby-core:76534] [Bug #12614] + Sat Aug 27 03:37:49 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/ossl_config.c: fix memory leak. diff --git a/id_table.c b/id_table.c index 13adf6babb..423b00669b 100644 --- a/id_table.c +++ b/id_table.c @@ -1302,6 +1302,9 @@ hash_table_extend(struct hash_id_table* tbl) int i; item_t* old; struct hash_id_table tmp_tbl = {0, 0, 0}; + if (new_cap < tbl->capa) { + new_cap = round_capa(tbl->used + (tbl->used >> 1)); + } tmp_tbl.capa = new_cap; tmp_tbl.items = ZALLOC_N(item_t, new_cap); for (i = 0; i < tbl->capa; i++) { @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-08-27" -#define RUBY_PATCHLEVEL 179 +#define RUBY_PATCHLEVEL 180 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 |