Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct malloc() size computation mistake. bug from bsdi, found

Browse Source 
by kjc.  sync with kame.
This commit is contained in:
itojun 2000-07-24 12:06:55 +00:00
parent 1b7b60f391
commit ff9df0b1b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/net/if_nameindex.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_nameindex.c,v 1.3 2000/07/06 02:55:45 christos Exp $ */
/* $KAME: if_nameindex.c,v 1.3 2000/04/24 10:08:41 itojun Exp $ */
/* $NetBSD: if_nameindex.c,v 1.4 2000/07/24 12:06:55 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.3 2000/07/06 02:55:45 christos Exp $");
__RCSID("$NetBSD: if_nameindex.c,v 1.4 2000/07/24 12:06:55 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -113,11 +113,11 @@ if_nameindex(void)
* for the array of structures, and the last part for
* the strings.
*/
cp = malloc(ni*(sizeof(struct if_nameindex) + 1) + nbytes);
ifni = (struct if_nameindex *)(void *)cp;
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,