d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sicnce this code shares the same fragment as gethostnamaddr:

Browse Source 
Change strtok() to strsep(), cause memory corruption for all
programs which use strtok() too in the same time.
Fix potential NULL reference, depends of /etc/hosts.conf format
Fix the bug when service name fetched always from beginning of the line,
not from parsed token.
This commit is contained in:
ache 1995-03-24 15:51:30 +00:00
parent 74c984e74d
commit 522e5e4d53
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/libc/net/getnetnamadr.c
View File

@ -24,8 +24,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)$Id: getnetnamadr.c,v 1.1 1994/09/25 02:12:29 pst Exp $";
static char rcsid[] = "$Id: getnetnamadr.c,v 1.1 1994/09/25 02:12:29 pst Exp $";
static char sccsid[] = "@(#)$Id: getnetnamadr.c,v 1.2 1994/09/26 22:45:10 wollman Exp $";
static char rcsid[] = "$Id: getnetnamadr.c,v 1.2 1994/09/26 22:45:10 wollman Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@ -90,7 +90,7 @@ get_service_name(const char *name) {
static void
init_services()
{
char *cp, buf[BUFSIZ];
char *cp, *p, buf[BUFSIZ];
register int cc = 0;
FILE *fd;
@ -103,14 +103,20 @@ init_services()
if(buf[0] == '#')
continue;
cp = strtok(buf, "\n \t,:;");
p = buf;
while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
;
if (cp == NULL)
continue;
do {
if(!isalpha(cp[0])) continue;
service_order[cc] = get_service_name(buf);
if(service_order[cc] != SERVICE_NONE)
cc++;
} while((cp = strtok((char *)0, "\n \t,:;"))
&& (cc < SERVICE_MAX));
if (isalpha(cp[0])) {
service_order[cc] = get_service_name(cp);
if(service_order[cc] != SERVICE_NONE)
cc++;
}
while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
;
} while(cp != NULL && cc < SERVICE_MAX);
}
service_order[cc] = SERVICE_NONE;
fclose(fd);