Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lack of timeout is a programming error, so use an assert in it's place. 

While here, improve the error reported if malloc fails.
This commit is contained in:
roy 2018-04-20 16:07:48 +00:00
parent 27e3ea924d
commit 5f8de401f6
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/rtadvd/timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: timer.c,v 1.17 2018/04/20 15:59:17 roy Exp $ */
/* $NetBSD: timer.c,v 1.18 2018/04/20 16:07:48 roy Exp $ */
/* $KAME: timer.c,v 1.11 2005/04/14 06:22:35 suz Exp $ */
/*
@ -33,6 +33,7 @@
#include <sys/queue.h>
#include <sys/time.h>
#include <assert.h>
#include <limits.h>
#include <unistd.h>
#include <syslog.h>
@ -63,19 +64,15 @@ rtadvd_add_timer(struct rtadvd_timer *(*timeout) (void *),
{
struct rtadvd_timer *newtimer;
assert(timeout != NULL);
if ((newtimer = malloc(sizeof(*newtimer))) == NULL) {
logit(LOG_ERR,
"<%s> can't allocate memory", __func__);
logit(LOG_ERR, "%s: malloc: %m", __func__);
exit(EXIT_FAILURE);
}
memset(newtimer, 0, sizeof(*newtimer));
if (timeout == NULL) {
logit(LOG_ERR,
"<%s> timeout function unspecified", __func__);
exit(EXIT_FAILURE);
}
newtimer->expire = timeout;
newtimer->update = update;
newtimer->expire_data = timeodata;