diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-11-03 07:20:34 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-11-03 07:20:34 +0100 |
| commit | 710f3747352fb93a63e5b69b12379da37f5b3fa9 (patch) | |
| tree | c3c72c89163211a54b74fd76cf4754bb13abc6c5 /openbsd-compat | |
| parent | - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep. (diff) | |
| download | openssh-710f3747352fb93a63e5b69b12379da37f5b3fa9.tar.xz openssh-710f3747352fb93a63e5b69b12379da37f5b3fa9.zip | |
- (dtucker) [openbsd-compat/setproctitle.c] Handle error case form the 2nd
vsnprintf. From eric at openbsd via chl@.
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/setproctitle.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c index 2965f689e..a69db22a2 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c @@ -125,6 +125,7 @@ setproctitle(const char *fmt, ...) va_list ap; char buf[1024], ptitle[1024]; size_t len; + int r; extern char *__progname; #if SPT_TYPE == SPT_PSTAT union pstun pst; @@ -137,13 +138,16 @@ setproctitle(const char *fmt, ...) strlcpy(buf, __progname, sizeof(buf)); + r = -1; va_start(ap, fmt); if (fmt != NULL) { len = strlcat(buf, ": ", sizeof(buf)); if (len < sizeof(buf)) - vsnprintf(buf + len, sizeof(buf) - len , fmt, ap); + r = vsnprintf(buf + len, sizeof(buf) - len , fmt, ap); } va_end(ap); + if (r == -1 || (size_t)r >= sizeof(buf) - len) + return; strnvis(ptitle, buf, sizeof(ptitle), VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL); |