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

Handle snprintf() returning -1.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Brian Somers 2001-08-20 12:50:21 +00:00
parent b174363035
commit 2449bf28ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=81972
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libdevstat/devstat.c
View File

@ -269,7 +269,8 @@ devstat_checkversion(kvm_t *kd)
errlen = snprintf(tmpstr, sizeof(tmpstr), "\n"); errlen = snprintf(tmpstr, sizeof(tmpstr), "\n");
strncat(devstat_errbuf, tmpstr, strncat(devstat_errbuf, tmpstr,
DEVSTAT_ERRBUF_SIZE - buflen - 1); DEVSTAT_ERRBUF_SIZE - buflen - 1);
buflen += errlen; if (errlen > 0)
buflen += errlen;
} }
errlen = snprintf(tmpstr, sizeof(tmpstr), errlen = snprintf(tmpstr, sizeof(tmpstr),
@ -281,7 +282,8 @@ devstat_checkversion(kvm_t *kd)
if (version == -1) { if (version == -1) {
strncat(devstat_errbuf, tmpstr, strncat(devstat_errbuf, tmpstr,
DEVSTAT_ERRBUF_SIZE - buflen - 1); DEVSTAT_ERRBUF_SIZE - buflen - 1);
buflen += errlen; if (errlen > 0)
buflen += errlen;
} else { } else {
strncpy(devstat_errbuf, tmpstr, DEVSTAT_ERRBUF_SIZE); strncpy(devstat_errbuf, tmpstr, DEVSTAT_ERRBUF_SIZE);
devstat_errbuf[DEVSTAT_ERRBUF_SIZE - 1] = '\0'; devstat_errbuf[DEVSTAT_ERRBUF_SIZE - 1] = '\0';

3
lib/libfetch/ftp.c
View File

@ -744,7 +744,8 @@ _ftp_authenticate(int cd, struct url *url, struct url *purl)
if (!pwd || !*pwd) { if (!pwd || !*pwd) {
if ((logname = getlogin()) == 0) if ((logname = getlogin()) == 0)
logname = FTP_ANONYMOUS_USER; logname = FTP_ANONYMOUS_USER;
len = snprintf(pbuf, MAXLOGNAME + 1, "%s@", logname); if ((len = snprintf(pbuf, MAXLOGNAME + 1, "%s@", logname)) == -1)
len = 0;
gethostname(pbuf + len, sizeof pbuf - len); gethostname(pbuf + len, sizeof pbuf - len);
pwd = pbuf; pwd = pbuf;
} }

2
libexec/rlogind/rlogind.c
View File

@ -555,6 +555,8 @@ fatal(f, msg, syserr)
msg, strerror(errno)); msg, strerror(errno));
else else
len = snprintf(bp, sizeof(buf), "rlogind: %s.\r\n", msg); len = snprintf(bp, sizeof(buf), "rlogind: %s.\r\n", msg);
if (len == -1)
len = 0;
(void) write(f, buf, bp + len - buf); (void) write(f, buf, bp + len - buf);
exit(1); exit(1);
} }