[src/netbsd-1-5]: src/lib/libc/net pullup 1.3 -> 1.4 (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/a1cabb5639bc
branches:  netbsd-1-5
changeset: 488684:a1cabb5639bc
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Jul 24 14:11:09 2000 +0000

description:
pullup 1.3 -> 1.4 (approved by releng-1-5)
correct malloc() size computation mistake.  bug from bsdi, found
by kjc.  sync with kame.

diffstat:

 lib/libc/net/if_nameindex.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r ca1a7e95d15c -r a1cabb5639bc lib/libc/net/if_nameindex.c
--- a/lib/libc/net/if_nameindex.c       Mon Jul 24 11:30:46 2000 +0000
+++ b/lib/libc/net/if_nameindex.c       Mon Jul 24 14:11:09 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: if_nameindex.c,v 1.2 2000/04/24 10:40:25 itojun Exp $  */
-/*     $KAME: if_nameindex.c,v 1.3 2000/04/24 10:08:41 itojun Exp $    */
+/*     $NetBSD: if_nameindex.c,v 1.2.4.1 2000/07/24 14:11:09 itojun Exp $      */
+/*     $KAME: if_nameindex.c,v 1.5 2000/07/24 12:03:31 itojun Exp $    */
 
 /*-
  * Copyright (c) 1997, 2000
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_nameindex.c,v 1.2 2000/04/24 10:40:25 itojun Exp $");
+__RCSID("$NetBSD: if_nameindex.c,v 1.2.4.1 2000/07/24 14:11:09 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -113,11 +113,11 @@
         * for the array of structures, and the last part for
         * the strings.
         */
-       cp = malloc(ni*(sizeof(struct if_nameindex) + 1) + nbytes);
+       cp = malloc((ni + 1) * sizeof(struct if_nameindex) + nbytes);
        ifni = (struct if_nameindex *)cp;
        if (ifni == NULL)
                goto out;
-       cp += ni*(sizeof(struct if_nameindex) + 1);
+       cp += (ni + 1) * sizeof(struct if_nameindex);
 
        /*
         * Now just loop through the list of interfaces again,