From: Petri Lehtinen Date: Thu, 31 Mar 2011 13:37:41 +0000 (+0300) Subject: Fix a few malloc() and free() calls X-Git-Tag: v2.0.1~1 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=eab23f05d873a7099f355ad937c9b8522abcc18e Fix a few malloc() and free() calls Replace them with jsonp_malloc() and jsonp_free() to support the custom memory allocation. --- diff --git a/src/hashtable.c b/src/hashtable.c index de25c21..9a3f73b 100644 --- a/src/hashtable.c +++ b/src/hashtable.c @@ -126,7 +126,7 @@ static int hashtable_do_del(hashtable_t *hashtable, if(hashtable->free_value) hashtable->free_value(pair->value); - free(pair); + jsonp_free(pair); hashtable->size--; return 0; diff --git a/src/strbuffer.c b/src/strbuffer.c index 758e95e..1b20e2b 100644 --- a/src/strbuffer.c +++ b/src/strbuffer.c @@ -19,7 +19,7 @@ int strbuffer_init(strbuffer_t *strbuff) strbuff->size = STRBUFFER_MIN_SIZE; strbuff->length = 0; - strbuff->value = malloc(strbuff->size); + strbuff->value = jsonp_malloc(strbuff->size); if(!strbuff->value) return -1; @@ -30,7 +30,7 @@ int strbuffer_init(strbuffer_t *strbuff) void strbuffer_close(strbuffer_t *strbuff) { - free(strbuff->value); + jsonp_free(strbuff->value); strbuff->size = 0; strbuff->length = 0; strbuff->value = NULL;