Check the allocation was successful before freeing existing hashtable buckets

and increasing hashtable order

Fixes a crash observed when there is OOM in hashtable_do_rehash

1 files changed, 9 insertions, 7 deletions

diff --git a/src/hashtable.c b/src/hashtable.c
index a453b00..76214f0 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -152,17 +152,19 @@ static int hashtable_do_rehash(hashtable_t *hashtable)
 {
     list_t *list, *next;
     pair_t *pair;
-    size_t i, index, new_size;
+    size_t i, index, new_size, new_order;
 
-    jsonp_free(hashtable->buckets);
-
-    hashtable->order++;
-    new_size = hashsize(hashtable->order);
+    new_order = hashtable->order + 1;
+    new_size = hashsize(new_order);
 
-    hashtable->buckets = jsonp_malloc(new_size * sizeof(bucket_t));
-    if(!hashtable->buckets)
+    struct hashtable_bucket *new_buckets = jsonp_malloc(new_size * sizeof(bucket_t));
+    if(!new_buckets)
         return -1;
 
+    jsonp_free(hashtable->buckets);
+    hashtable->buckets = new_buckets;
+    hashtable->order = new_order;
+
     for(i = 0; i < hashsize(hashtable->order); i++)
     {
         hashtable->buckets[i].first = hashtable->buckets[i].last =