From 04559014df6181892efd591948aeb8a408bd7e49 Mon Sep 17 00:00:00 2001 From: mmcc Date: Tue, 27 Oct 2015 18:19:34 +0000 Subject: calloc -> malloc when the memory is immediately overwritten with memcpy. ok claudio@ --- usr.sbin/bgpd/mrt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin/bgpd/mrt.c') diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c index 2357caee5bc..3dbf6c12890 100644 --- a/usr.sbin/bgpd/mrt.c +++ b/usr.sbin/bgpd/mrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mrt.c,v 1.78 2015/08/20 22:39:29 deraadt Exp $ */ +/* $OpenBSD: mrt.c,v 1.79 2015/10/27 18:19:33 mmcc Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker @@ -990,7 +990,7 @@ mrt_mergeconfig(struct mrt_head *xconf, struct mrt_head *nconf) LIST_FOREACH(m, nconf, entry) { if ((xm = mrt_get(xconf, m)) == NULL) { /* NEW */ - if ((xm = calloc(1, sizeof(struct mrt_config))) == NULL) + if ((xm = malloc(sizeof(struct mrt_config))) == NULL) fatal("mrt_mergeconfig"); memcpy(xm, m, sizeof(struct mrt_config)); xm->state = MRT_STATE_OPEN; -- cgit v1.2.3