CVS commit: [netbsd-7] src/usr.bin/netstat

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Wed Feb 11 08:29:56 UTC 2015

Modified Files:
        src/usr.bin/netstat [netbsd-7]: inet.c inet6.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #503):
        usr.bin/netstat/inet.c: revision 1.106
        usr.bin/netstat/inet6.c: revision 1.68
Allocate the right size for pcb blocks.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.4.1 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.66 -r1.66.4.1 src/usr.bin/netstat/inet6.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/netstat/inet.c
diff -u src/usr.bin/netstat/inet.c:1.104 src/usr.bin/netstat/inet.c:1.104.4.1
--- src/usr.bin/netstat/inet.c:1.104	Sat Nov 23 22:01:12 2013
+++ src/usr.bin/netstat/inet.c	Wed Feb 11 08:29:56 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet.c,v 1.104 2013/11/23 22:01:12 christos Exp $	*/
+/*	$NetBSD: inet.c,v 1.104.4.1 2015/02/11 08:29:56 snj 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.104 2013/11/23 22:01:12 christos Exp $");
+__RCSID("$NetBSD: inet.c,v 1.104.4.1 2015/02/11 08:29:56 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -285,7 +285,7 @@ getpcblist_kmem(u_long off, const char *
 	next = TAILQ_FIRST(head);
 	prev = TAILQ_END(head);
 
-	if ((pcblist = malloc(size)) == NULL)
+	if ((pcblist = malloc(size * sizeof(*pcblist))) == NULL)
 		err(1, "malloc");
 
 	i = 0;
@@ -316,7 +316,9 @@ getpcblist_kmem(u_long off, const char *
 		pcblist[i].ki_tstate = tcpcb.t_state;
 		pcblist[i].ki_pflags = inpcb.inp_flags;
 		if (i++ == size) {
-			struct kinfo_pcb *n = realloc(pcblist, size += 100);
+			size += 100;
+			struct kinfo_pcb *n = realloc(pcblist,
+			    size * sizeof(*pcblist));
 			if (n == NULL)
 				err(1, "realloc");
 			pcblist = n;

Index: src/usr.bin/netstat/inet6.c
diff -u src/usr.bin/netstat/inet6.c:1.66 src/usr.bin/netstat/inet6.c:1.66.4.1
--- src/usr.bin/netstat/inet6.c:1.66	Sat Nov 23 22:01:12 2013
+++ src/usr.bin/netstat/inet6.c	Wed Feb 11 08:29:56 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet6.c,v 1.66 2013/11/23 22:01:12 christos Exp $	*/
+/*	$NetBSD: inet6.c,v 1.66.4.1 2015/02/11 08:29:56 snj 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.66 2013/11/23 22:01:12 christos Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.66.4.1 2015/02/11 08:29:56 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -302,7 +302,7 @@ getpcblist_kmem(u_long off, const char *
 	next = TAILQ_FIRST(head);
 	prev = TAILQ_END(head);
 
-	if ((pcblist = malloc(size)) == NULL)
+	if ((pcblist = malloc(size * sizeof(*pcblist))) == NULL)
 		err(1, "malloc");
 
 	i = 0;
@@ -337,7 +337,9 @@ getpcblist_kmem(u_long off, const char *
 		memcpy(&pcblist[i].ki_d, &sin6, sizeof(sin6));
 		pcblist[i].ki_tstate = tcpcb.t_state;
 		if (i++ == size) {
-			struct kinfo_pcb *n = realloc(pcblist, size += 100);
+			size += 100;
+			struct kinfo_pcb *n = realloc(pcblist,
+			    size * sizeof(*pcblist));
 			if (n == NULL)
 				err(1, "realloc");
 			pcblist = n;