From c96a62e26cee50adc960812cd0fe4a3ee5882a45 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 12 Mar 2003 21:45:51 +0000 Subject: [PATCH] Use emalloc2() to allocate N things of a certain size. --- interfaces.c | 4 ++-- sudo.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces.c b/interfaces.c index 8d06d2e46..b4f843e57 100644 --- a/interfaces.c +++ b/interfaces.c @@ -135,7 +135,7 @@ load_interfaces() } } interfaces = - (struct interface *) emalloc(sizeof(struct interface) * num_interfaces); + (struct interface *) emalloc2(num_interfaces, sizeof(struct interface)); /* Store the ip addr / netmask pairs. */ for (ifa = ifaddrs, i = 0; ifa -> ifa_next; ifa = ifa -> ifa_next) { @@ -219,7 +219,7 @@ load_interfaces() /* Allocate space for the maximum number of interfaces that could exist. */ n = ifconf->ifc_len / sizeof(struct ifreq); - interfaces = (struct interface *) emalloc(sizeof(struct interface) * n); + interfaces = (struct interface *) emalloc2(n, sizeof(struct interface)); /* For each interface, store the ip address and netmask. */ for (i = 0; i < ifconf->ifc_len; ) { diff --git a/sudo.c b/sudo.c index 0486181a8..aa7f7e05d 100644 --- a/sudo.c +++ b/sudo.c @@ -567,7 +567,7 @@ init_vars(sudo_mode) if ((sudo_mode & MODE_SHELL)) { char **dst, **src = NewArgv; - NewArgv = (char **) emalloc (sizeof(char *) * (++NewArgc + 1)); + NewArgv = (char **) emalloc2((++NewArgc + 1), sizeof(char *)); if (user_shell && *user_shell) { NewArgv[0] = user_shell; } else { -- 2.40.0