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

Stop adding trailing '\n'. The servent_unpack() doesn't expect

Browse Source 
lines terminated with '\n'.

MFC after:	2 weeks
This commit is contained in:
ume 2010-04-04 07:02:10 +00:00
parent a8e5a68f92
commit 74ecc8e0c6
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libc/net/getservent.c
View File

@ -594,15 +594,13 @@ nis_servent(void *retval, void *mdata, va_list ap)
break;
};
/* we need a room for additional \n symbol */
if (bufsize <=
resultbuflen + 1 + _ALIGNBYTES + sizeof(char *)) {
if (bufsize <= resultbuflen + _ALIGNBYTES + sizeof(char *)) {
*errnop = ERANGE;
rv = NS_RETURN;
break;
}
aliases = (char **)_ALIGN(&buffer[resultbuflen + 2]);
aliases = (char **)_ALIGN(&buffer[resultbuflen + 1]);
aliases_size =
(buffer + bufsize - (char *)aliases) / sizeof(char *);
if (aliases_size < 1) {
@ -611,13 +609,8 @@ nis_servent(void *retval, void *mdata, va_list ap)
break;
}
/*
* servent_unpack expects lines terminated with \n --
* make it happy
*/
memcpy(buffer, resultbuf, resultbuflen);
buffer[resultbuflen] = '\n';
buffer[resultbuflen + 1] = '\0';
buffer[resultbuflen] = '\0';
if (servent_unpack(buffer, serv, aliases, aliases_size,
errnop) != 0) {