diff options
| author |   henning <henning@openbsd.org> | 2004-02-05 13:33:22 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2004-02-05 13:33:22 +0000 |
| commit | d8d28c0443aeee54e4286565737bfafa3eb78571 (patch) | |
| tree | b44bd79a01c4fb59d8cbb916a2e278ec692b2be2 | |
| parent | small logging cleanup and improvement requested by markus (diff) | |
| download | wireguard-openbsd-d8d28c0443aeee54e4286565737bfafa3eb78571.tar.xz wireguard-openbsd-d8d28c0443aeee54e4286565737bfafa3eb78571.zip | |
plug memory leak; PR3668 Emil Mikulic <emikulic@dmr.ath.cx>
| -rw-r--r-- | sbin/dhclient/dhclient.c | 7 | ||||
| -rw-r--r-- | usr.sbin/dhcp/dhclient/dhclient.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 7d0133ff1d4..c48cd70a21a 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.3 2004/02/04 12:16:56 henning Exp $ */ +/* $OpenBSD: dhclient.c,v 1.4 2004/02/05 13:33:22 henning Exp $ */ /* DHCP Client. */ @@ -1931,8 +1931,9 @@ script_init(struct interface_info *ip, char *reason, struct string_list *medium) { if (ip) { ip->client->scriptEnvsize = 100; - ip->client->scriptEnv = - malloc(ip->client->scriptEnvsize * sizeof(char *)); + if (ip->client->scriptEnv == NULL) + ip->client->scriptEnv = + malloc(ip->client->scriptEnvsize * sizeof(char *)); if (ip->client->scriptEnv == NULL) error("script_init: no memory for environment initialization"); diff --git a/usr.sbin/dhcp/dhclient/dhclient.c b/usr.sbin/dhcp/dhclient/dhclient.c index 959bd444e00..bc69b24eae4 100644 --- a/usr.sbin/dhcp/dhclient/dhclient.c +++ b/usr.sbin/dhcp/dhclient/dhclient.c @@ -2028,8 +2028,9 @@ void script_init (ip, reason, medium) { if (ip) { ip->client->scriptEnvsize = 100; - ip->client->scriptEnv = malloc(ip->client->scriptEnvsize - * sizeof(char *)); + if (ip->client->scriptEnv == NULL) + ip->client->scriptEnv = + malloc(ip->client->scriptEnvsize * sizeof(char *)); if (ip->client->scriptEnv == NULL) error ("script_init: no memory for environment initialization"); |