commit 41bfc29ea5416ea0a389635291bcf388d4bdc225
author Damien Miller <djm@mindrot.org> Thu May 26 12:07:32 2005 +1000
committer Damien Miller <djm@mindrot.org> Thu May 26 12:07:32 2005 +1000
tree 85eef9ee1416ca8dea07815847d77197038f212c
parent dadfd4dd3862df5cebae2f2dc9b7f112321fa85e

   - moritz@cvs.openbsd.org 2005/04/28 10:17:56
     [progressmeter.c ssh-keyscan.c]
     add snprintf checks. ok djm@ markus@

progressmeter.c

diff --git a/progressmeter.c b/progressmeter.c
index 93f5a3e..febe9aa 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.22 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.23 2005/04/28 10:17:56 moritz Exp $");
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -147,6 +147,8 @@
 		len = snprintf(buf, file_len + 1, "\r%s", file);
 		if (len < 0)
 			len = 0;
+		if (len >= file_len + 1)
+			len = file_len;
 		for (i = len;  i < file_len; i++ )
 			buf[i] = ' ';
 		buf[file_len] = '\0';