[src/trunk]: src/lib/libc/net fix memory allocation, and an off-by-one

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

details:   https://anonhg.NetBSD.org/src/rev/42caa7057667
branches:  trunk
changeset: 326072:42caa7057667
user:      drochner <drochner%NetBSD.org@localhost>
date:      Fri Jan 17 12:39:47 2014 +0000

description:
fix memory allocation, and an off-by-one

diffstat:

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

diffs (38 lines):

diff -r e0415585f1fb -r 42caa7057667 lib/libc/net/gethnamaddr.c
--- a/lib/libc/net/gethnamaddr.c        Fri Jan 17 10:55:01 2014 +0000
+++ b/lib/libc/net/gethnamaddr.c        Fri Jan 17 12:39:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gethnamaddr.c,v 1.88 2014/01/17 02:08:44 christos Exp $        */
+/*     $NetBSD: gethnamaddr.c,v 1.89 2014/01/17 12:39:47 drochner Exp $        */
 
 /*
  * ++Copyright++ 1985, 1988, 1993
@@ -57,7 +57,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c    8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
 #else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.88 2014/01/17 02:08:44 christos Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.89 2014/01/17 12:39:47 drochner Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -109,8 +109,8 @@
 #define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)
 
 #define addalias(d, s, arr, siz) do {                  \
-       if (d >= &arr[siz - 1]) {                       \
-               char **xptr = realloc(arr, siz + 10);   \
+       if (d >= &arr[siz]) {                           \
+               char **xptr = realloc(arr, (siz + 10) * sizeof(*arr)); \
                if (xptr == NULL)                       \
                        goto nospc;                     \
                d = xptr + (d - arr);                   \
@@ -121,7 +121,7 @@
 } while (/*CONSTCOND*/0)
 
 #define setup(arr, siz) do {                           \
-       arr = malloc(siz = 10);                         \
+       arr = malloc((siz = 10) * sizeof(*arr));        \
        if (arr == NULL)                                \
                goto nospc;                             \
 } while (/*CONSTCOND*/0)