Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 2 deletions

diff --git a/src/st.c b/src/st.c
index 522f205..8ee610b 100644
--- a/src/st.c
+++ b/src/st.c
@@ -151,6 +151,7 @@ st_init_table_with_size(type, size)
 #endif
 
   size = new_size(size);	/* round up to prime number */
+  if (size <= 0) return 0;
 
   tbl = alloc(st_table);
   if (tbl == 0) return 0;
@@ -318,10 +319,13 @@ rehash(table)
      register st_table *table;
 {
   register st_table_entry *ptr, *next, **new_bins;
-  int i, old_num_bins = table->num_bins, new_num_bins;
+  int i, new_num_bins, old_num_bins;
   unsigned int hash_val;
 
-  new_num_bins = new_size(old_num_bins+1);
+  old_num_bins = table->num_bins;
+  new_num_bins = new_size(old_num_bins + 1);
+  if (new_num_bins <= 0) return ;
+
   new_bins = (st_table_entry**)Calloc(new_num_bins, sizeof(st_table_entry*));
   if (new_bins == 0) {
     return ;