summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2010-12-11 17:47:27 +0000
committerjilles <jilles@FreeBSD.org>2010-12-11 17:47:27 +0000
commit353bb2f73a1f30ee92d1ef6e93b26b86e7b28dce (patch)
tree49d1e10e00117ff65223509fdccd4c9c58097947 /bin
parent4bcdb20a604f3f16ea8b45accd7679739119339f (diff)
downloadFreeBSD-src-353bb2f73a1f30ee92d1ef6e93b26b86e7b28dce.zip
FreeBSD-src-353bb2f73a1f30ee92d1ef6e93b26b86e7b28dce.tar.gz
sh: Use vsnprintf() rather than crafting our own in fmtstr().
Add INTOFF/INTON as longjmp out of vsnprintf may cause memory leaks or undefined behaviour.
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/output.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 8442a22..b4dab51 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -64,8 +64,7 @@ __FBSDID("$FreeBSD$");
#define OUTBUFSIZ BUFSIZ
-#define BLOCK_OUT -2 /* output to a fixed block of memory */
-#define MEM_OUT -3 /* output to dynamically allocated memory */
+#define MEM_OUT -2 /* output to dynamically allocated memory */
#define OUTPUT_ERR 01 /* error occurred on output */
static int doformat_wr(void *, const char *, int);
@@ -180,18 +179,12 @@ outbin(const void *data, size_t len, struct output *file)
outc(*p++, file);
}
-static char out_junk[16];
-
void
emptyoutbuf(struct output *dest)
{
int offset;
- if (dest->fd == BLOCK_OUT) {
- dest->nextc = out_junk;
- dest->nleft = sizeof out_junk;
- dest->flags |= OUTPUT_ERR;
- } else if (dest->buf == NULL) {
+ if (dest->buf == NULL) {
INTOFF;
dest->buf = ckmalloc(dest->bufsize);
dest->nextc = dest->buf;
@@ -282,18 +275,12 @@ void
fmtstr(char *outbuf, int length, const char *fmt, ...)
{
va_list ap;
- struct output strout;
- strout.nextc = outbuf;
- strout.nleft = length;
- strout.fd = BLOCK_OUT;
- strout.flags = 0;
+ INTOFF;
va_start(ap, fmt);
- doformat(&strout, fmt, ap);
+ vsnprintf(outbuf, length, fmt, ap);
va_end(ap);
- outc('\0', &strout);
- if (strout.flags & OUTPUT_ERR)
- outbuf[length - 1] = '\0';
+ INTON;
}
static int
OpenPOWER on IntegriCloud