From 362a260c6d9d66ee1ae6bc18eb78510bd65a9e62 Mon Sep 17 00:00:00 2001 From: liamjfoy Date: Sun, 21 May 2006 21:01:55 +0000 Subject: [PATCH] check if malloc(3) failed ok joerg@ --- usr.bin/netstat/inet.c | 7 ++++--- usr.bin/netstat/inet6.c | 7 ++++--- usr.bin/netstat/unix.c | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 72f58ea4734f..577e9d23f32b 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $NetBSD: inet.c,v 1.70 2006/05/18 17:19:22 riz Exp $ */ +/* $NetBSD: inet.c,v 1.71 2006/05/21 21:01:55 liamjfoy Exp $ */ /* * Copyright (c) 1983, 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -__RCSID("$NetBSD: inet.c,v 1.70 2006/05/18 17:19:22 riz Exp $"); +__RCSID("$NetBSD: inet.c,v 1.71 2006/05/21 21:01:55 liamjfoy Exp $"); #endif #endif /* not lint */ @@ -206,7 +206,8 @@ protopr(off, name) NULL, 0) == -1) err(1, "sysctl (query)"); - pcblist = malloc(size); + if ((pcblist = malloc(size)) == NULL) + err(1, "malloc"); memset(pcblist, 0, size); mib[6] = sizeof(*pcblist); diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c index 058bd90cc0c5..b9be819592a9 100644 --- a/usr.bin/netstat/inet6.c +++ b/usr.bin/netstat/inet6.c @@ -1,4 +1,4 @@ -/* $NetBSD: inet6.c,v 1.36 2005/08/28 21:06:57 rpaulo Exp $ */ +/* $NetBSD: inet6.c,v 1.37 2006/05/21 21:01:56 liamjfoy Exp $ */ /* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */ /* @@ -64,7 +64,7 @@ #if 0 static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -__RCSID("$NetBSD: inet6.c,v 1.36 2005/08/28 21:06:57 rpaulo Exp $"); +__RCSID("$NetBSD: inet6.c,v 1.37 2006/05/21 21:01:56 liamjfoy Exp $"); #endif #endif /* not lint */ @@ -262,7 +262,8 @@ ip6protopr(off, name) NULL, 0) == -1) err(1, "sysctl (query)"); - pcblist = malloc(size); + if ((pcblist = malloc(size)) == NULL) + err(1, "malloc"); memset(pcblist, 0, size); mib[6] = sizeof(*pcblist); diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c index a125706d2a85..c5f3c416220e 100644 --- a/usr.bin/netstat/unix.c +++ b/usr.bin/netstat/unix.c @@ -1,4 +1,4 @@ -/* $NetBSD: unix.c,v 1.25 2006/05/11 01:23:20 mrg Exp $ */ +/* $NetBSD: unix.c,v 1.26 2006/05/21 21:01:56 liamjfoy Exp $ */ /*- * Copyright (c) 1983, 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "from: @(#)unix.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: unix.c,v 1.25 2006/05/11 01:23:20 mrg Exp $"); +__RCSID("$NetBSD: unix.c,v 1.26 2006/05/21 21:01:56 liamjfoy Exp $"); #endif #endif /* not lint */ @@ -165,7 +165,8 @@ unixpr(off) NULL, 0) == -1) err(1, "sysctl (query)"); - pcblist = malloc(size); + if ((pcblist = malloc(size)) == NULL) + err(1, "malloc"); memset(pcblist, 0, size); mib[6] = sizeof(*pcblist);