- (dtucker) [openbsd-compat/bsd-snprintf.c] Check for max length too.

ok djm@
This commit is contained in:
Darren Tucker 2004-09-21 21:32:12 +10:00
parent 623d92f0b2
commit 50fbb45dbd
2 changed files with 7 additions and 3 deletions

View File

@ -1,3 +1,7 @@
20040921
- (dtucker) [openbsd-compat/bsd-snprintf.c] Check for max length too.
ok djm@
20040912
- (djm) [loginrec.c] Start KNF and tidy up of this long-neglected file.
No change in resultant binary
@ -1744,4 +1748,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3552 2004/09/12 12:36:15 dtucker Exp $
$Id: ChangeLog,v 1.3553 2004/09/21 11:32:12 dtucker Exp $

View File

@ -58,7 +58,7 @@
#include "includes.h"
RCSID("$Id: bsd-snprintf.c,v 1.7 2003/05/18 14:13:39 djm Exp $");
RCSID("$Id: bsd-snprintf.c,v 1.8 2004/09/21 11:32:13 dtucker Exp $");
#if defined(BROKEN_SNPRINTF) /* For those with broken snprintf() */
# undef HAVE_SNPRINTF
@ -369,7 +369,7 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen,
if (value == 0)
value = "<NULL>";
for (strln = 0; value[strln]; ++strln); /* strlen */
for (strln = 0; strln <= max && value[strln]; ++strln); /* strlen */
padlen = min - strln;
if (padlen < 0)
padlen = 0;