From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Mon, 16 Aug 2004 14:11:39 +0000 (+0000)
Subject: In cmd(), after the vsnprintf is a strcat done to append a newline.
X-Git-Tag: v2.0.1~10504
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b60cc1d03d404fb284b0879e1f0bae45772e0ba3

In cmd(), after the vsnprintf is a strcat done to append a newline.
Keep that in mind for the size calculation.
---

diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c
index 3bfc80f6a0..e3d1fd38ad 100644
--- a/lib/libftpio/ftpio.c
+++ b/lib/libftpio/ftpio.c
@@ -15,7 +15,7 @@
  * `state' of FTP_t
  *
  * $FreeBSD: src/lib/libftpio/ftpio.c,v 1.33.2.4 2002/07/25 15:25:32 ume Exp $
- * $DragonFly: src/lib/libftpio/ftpio.c,v 1.5 2004/08/16 14:07:34 joerg Exp $
+ * $DragonFly: src/lib/libftpio/ftpio.c,v 1.6 2004/08/16 14:11:39 joerg Exp $
  *
  */
 
@@ -708,7 +708,7 @@ cmd(FTP_t ftp, const char *fmt, ...)
 
     va_list ap;
     va_start(ap, fmt);
-    if ((size_t)vsnprintf(p, sizeof p, fmt, ap) >= sizeof(p))
+    if ((size_t)vsnprintf(p, sizeof p - 2, fmt, ap) >= sizeof(p) - 2)
 	return FAILURE;
     va_end(ap);