d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix printf(1) for cases where a long string with no format specifiers is

Browse Source 
followed by a %d (probably others too) format specifier.

Reviewed by:	audit
This commit is contained in:
Ben Smithurst 2000-12-21 22:21:38 +00:00
parent 2a0c503e7a
commit 3c6e4a5c16
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=70256
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/printf/printf.c
View File

@ -60,6 +60,7 @@ static const char rcsid[] =
#ifdef SHELL
#define main printfcmd
#include "bltin/bltin.h"
#include "memalloc.h"
#else
#define warnx1(a, b, c) warnx(a)
#define warnx2(a, b, c) warnx(a, b)
@ -247,12 +248,23 @@ mklong(str, ch)
char *str;
int ch;
{
static char copy[64];
int len;
static char *copy;
static size_t copy_size;
size_t len, newlen;
char *newcopy;
len = strlen(str) + 2;
if (len > sizeof copy)
return NULL;
if (len > copy_size) {
newlen = ((len + 1023) >> 10) << 10;
#ifdef SHELL
if ((newcopy = ckrealloc(copy, newlen)) == NULL)
#else
if ((newcopy = realloc(copy, newlen)) == NULL)
#endif
return (NULL);
copy = newcopy;
copy_size = newlen;
}
memmove(copy, str, len - 3);
copy[len - 3] = 'q';