2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 684675ca6..7513c3d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep.
    From OpenSMTPD where it prevents "implicit declaration" warnings (it's
    a no-op in OpenSSH).  From chl at openbsd.
+ - (dtucker) [openbsd-compat/setproctitle.c] Handle error case form the 2nd
+   vsnprintf.  From eric at openbsd via chl@.
 
 20131030
  - (djm) OpenBSD CVS Sync
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);