organicmaps/jansson
13
Fork 0
mirror of https://github.com/akheron/jansson.git synced 2025-04-04 21:15:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Check the allocation was successful before freeing existing hashtable buckets

Browse source 
and increasing hashtable order

Fixes a crash observed when there is OOM in hashtable_do_rehash
This commit is contained in:
Andreas Pasiopoulos 2016-08-11 17:48:29 +03:00
parent 835290dfdf
commit 86fdf76f79
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/hashtable.c
View file

@ -152,16 +152,18 @@ 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;
new_order = hashtable->order + 1;
new_size = hashsize(new_order);
struct hashtable_bucket *new_buckets = jsonp_malloc(new_size * sizeof(bucket_t));
if(!new_buckets)
return -1;
jsonp_free(hashtable->buckets);
hashtable->order++;
new_size = hashsize(hashtable->order);
hashtable->buckets = jsonp_malloc(new_size * sizeof(bucket_t));
if(!hashtable->buckets)
return -1;
hashtable->buckets = new_buckets;
hashtable->order = new_order;
for(i = 0; i < hashsize(hashtable->order); i++)
{