diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libdevstat/devstat.c | 6 | ||||
| -rw-r--r-- | lib/libfetch/ftp.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c index 7db6b99..86694ea 100644 --- a/lib/libdevstat/devstat.c +++ b/lib/libdevstat/devstat.c @@ -269,7 +269,8 @@ devstat_checkversion(kvm_t *kd) errlen = snprintf(tmpstr, sizeof(tmpstr), "\n"); strncat(devstat_errbuf, tmpstr, DEVSTAT_ERRBUF_SIZE - buflen - 1); - buflen += errlen; + if (errlen > 0) + buflen += errlen; } errlen = snprintf(tmpstr, sizeof(tmpstr), @@ -281,7 +282,8 @@ devstat_checkversion(kvm_t *kd) if (version == -1) { strncat(devstat_errbuf, tmpstr, DEVSTAT_ERRBUF_SIZE - buflen - 1); - buflen += errlen; + if (errlen > 0) + buflen += errlen; } else { strncpy(devstat_errbuf, tmpstr, DEVSTAT_ERRBUF_SIZE); devstat_errbuf[DEVSTAT_ERRBUF_SIZE - 1] = '\0'; diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index f1ffbf2..1274019 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -744,7 +744,8 @@ _ftp_authenticate(int cd, struct url *url, struct url *purl) if (!pwd || !*pwd) { if ((logname = getlogin()) == 0) 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); pwd = pbuf; } |
