summaryrefslogtreecommitdiff
path: root/sys/src/cmd/jpg
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2014-11-07 12:51:59 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2014-11-07 12:51:59 +0100
commit797cc13c7053dbdd16c20dc4dee5aee8c92390b0 (patch)
tree5aa7a00f0edeb1d2938d2dff116ee37f2570e8a5 /sys/src/cmd/jpg
parent5364fa720de3b963a88dc4810ed83b4f2ab11d12 (diff)
fix dangerous werrstr() usages
werrstr() takes a format string as its first argument. a common error is to pass user controlled string buffers into werrstr() that might contain format string escapes causing werrstr() to take bogus arguments from the stack and crash. so instead of doing: werrstr(buf); we want todo: werrstr("%s", buf); or if we have a local ERRMAX sized buffer that we can override: errstr(buf, sizeof buf);
Diffstat (limited to 'sys/src/cmd/jpg')
-rw-r--r--sys/src/cmd/jpg/readgif.c2
-rw-r--r--sys/src/cmd/jpg/readjpg.c2
-rw-r--r--sys/src/cmd/jpg/torgbv.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/src/cmd/jpg/readgif.c b/sys/src/cmd/jpg/readgif.c
index 0a5edd364..d5c0d1d7d 100644
--- a/sys/src/cmd/jpg/readgif.c
+++ b/sys/src/cmd/jpg/readgif.c
@@ -93,7 +93,7 @@ giferror(Header *h, char *fmt, ...)
vseprint(h->err, h->err+sizeof h->err, fmt, arg);
va_end(arg);
- werrstr(h->err);
+ werrstr("%s", h->err);
giffreeall(h, 1);
longjmp(h->errlab, 1);
}
diff --git a/sys/src/cmd/jpg/readjpg.c b/sys/src/cmd/jpg/readjpg.c
index a3ab3ed8a..676ce2afb 100644
--- a/sys/src/cmd/jpg/readjpg.c
+++ b/sys/src/cmd/jpg/readjpg.c
@@ -227,7 +227,7 @@ jpgerror(Header *h, char *fmt, ...)
vseprint(h->err, h->err+sizeof h->err, fmt, arg);
va_end(arg);
- werrstr(h->err);
+ werrstr("%s", h->err);
jpgfreeall(h, 1);
longjmp(h->errlab, 1);
}
diff --git a/sys/src/cmd/jpg/torgbv.c b/sys/src/cmd/jpg/torgbv.c
index ca84592b4..d1cef81a3 100644
--- a/sys/src/cmd/jpg/torgbv.c
+++ b/sys/src/cmd/jpg/torgbv.c
@@ -16,13 +16,13 @@ void*
_remaperror(char *fmt, ...)
{
va_list arg;
- char buf[256];
+ char buf[ERRMAX];
va_start(arg, fmt);
vseprint(buf, buf+sizeof buf, fmt, arg);
va_end(arg);
- werrstr(buf);
+ errstr(buf, sizeof buf);
return nil;
}