[src/netbsd-7]: src/usr.bin/netstat Pull up following revision(s) (requested ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ad0109b1a34
branches:  netbsd-7
changeset: 798972:6ad0109b1a34
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Feb 11 08:29:56 2015 +0000

description:
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.

diffstat:

 usr.bin/netstat/inet.c  |  10 ++++++----
 usr.bin/netstat/inet6.c |  10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 6b7040359ba3 -r 6ad0109b1a34 usr.bin/netstat/inet.c
--- a/usr.bin/netstat/inet.c    Wed Feb 11 08:25:40 2015 +0000
+++ b/usr.bin/netstat/inet.c    Wed Feb 11 08:29:56 2015 +0000
@@ -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 @@
        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 @@
                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;
diff -r 6b7040359ba3 -r 6ad0109b1a34 usr.bin/netstat/inet6.c
--- a/usr.bin/netstat/inet6.c   Wed Feb 11 08:25:40 2015 +0000
+++ b/usr.bin/netstat/inet6.c   Wed Feb 11 08:29:56 2015 +0000
@@ -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 @@
        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 @@
                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;