merge revision(s) 59748: [Backport #14073]

st.c: fix num_entries * st.c (st_insert2): should manage num_entries when the key is undefined, as well as st_insert(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@61328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Dec 18, 2017 · 3d4a397 · 3d4a397
1 parent 6079e6d
commit 3d4a397
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/st.c b/st.c
@@ -1182,6 +1182,8 @@ st_insert2(st_table *tab, st_data_t key, st_data_t value,
     if (tab->bins == NULL) {
         bin = find_entry(tab, hash_value, key);
 	new_p = bin == UNDEFINED_ENTRY_IND;
+	if (new_p)
+	    tab->num_entries++;
 	bin_ind = UNDEFINED_BIN_IND;
     } else {
         bin = find_table_bin_ptr_and_reserve(tab, &hash_value,

diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.4.4"
-#define RUBY_RELEASE_DATE "2017-12-16"
-#define RUBY_PATCHLEVEL 206
+#define RUBY_RELEASE_DATE "2017-12-19"
+#define RUBY_PATCHLEVEL 207
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"