From: Alan T. DeKok Date: Fri, 2 Dec 2011 16:43:33 +0000 (+0100) Subject: Added rad_calloc to mirror rad_malloc X-Git-Tag: release_3_0_0_beta0~456 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7410275799ecd07c4a094e7cbf282f1167afe64;p=thirdparty%2Ffreeradius-server.git Added rad_calloc to mirror rad_malloc --- diff --git a/src/include/radiusd.h b/src/include/radiusd.h index c5590a51a14..589812e75bb 100644 --- a/src/include/radiusd.h +++ b/src/include/radiusd.h @@ -598,6 +598,7 @@ void request_free(REQUEST **request); int rad_mkdir(char *directory, int mode); int rad_checkfilename(const char *filename); void *rad_malloc(size_t size); /* calls exit(1) on error! */ +void *rad_calloc(size_t size); /* calls exit(1) on error! */ REQUEST *request_alloc(void); REQUEST *request_alloc_fake(REQUEST *oldreq); REQUEST *request_alloc_coa(REQUEST *request); diff --git a/src/main/util.c b/src/main/util.c index 9c27bad8c5c..94ee44318a5 100644 --- a/src/main/util.c +++ b/src/main/util.c @@ -347,13 +347,21 @@ void *rad_malloc(size_t size) void *ptr = malloc(size); if (ptr == NULL) { - radlog(L_ERR|L_CONS, "no memory"); + radlog(L_ERR, "no memory"); exit(1); } return ptr; } + +void *rad_calloc(size_t size) +{ + void *ptr = rad_malloc(size); + memset(ptr, 0, size); + return ptr; +} + /* * Logs an error message and aborts the program *