qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use optarg as format string.

Browse Source 
ok millert@
This commit is contained in:
cheloha 2018-04-09 18:16:44 +00:00
parent c37ef19e61
commit 26b9521ab8
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/video/video.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: video.c,v 1.24 2018/04/09 15:48:14 cheloha Exp $ */ /* $OpenBSD: video.c,v 1.25 2018/04/09 18:16:44 cheloha Exp $ */
/* /*
* Copyright (c) 2010 Jacob Meuser <jakemsr@openbsd.org> * Copyright (c) 2010 Jacob Meuser <jakemsr@openbsd.org>
* *
@ -1853,6 +1853,7 @@ main(int argc, char *argv[])
struct dev *d = &vid.dev; struct dev *d = &vid.dev;
struct xdsp *x = &vid.xdsp; struct xdsp *x = &vid.xdsp;
const char *errstr; const char *errstr;
size_t len;
int ch, err = 0; int ch, err = 0;
bzero(&vid, sizeof(struct video)); bzero(&vid, sizeof(struct video));
@ -1882,7 +1883,11 @@ main(int argc, char *argv[])
} }
break; break;
case 'f': case 'f':
snprintf(d->path, sizeof(d->path), optarg); len = strlcpy(d->path, optarg, sizeof(d->path));
if (len >= sizeof(d->path)) {
warnx("file path is too long: %s", optarg);
err++;
}
break; break;
case 'g': case 'g':
vid.mmap_on = 0; vid.mmap_on = 0;
@ -1894,8 +1899,13 @@ main(int argc, char *argv[])
} else { } else {
vid.mode = (vid.mode & ~M_IN_DEV) | M_IN_FILE; vid.mode = (vid.mode & ~M_IN_DEV) | M_IN_FILE;
vid.mmap_on = 0; /* mmap mode does not work for files */ vid.mmap_on = 0; /* mmap mode does not work for files */
snprintf(vid.iofile, sizeof(vid.iofile), len = strlcpy(vid.iofile, optarg,
optarg); sizeof(vid.iofile));
if (len >= sizeof(vid.iofile)) {
warnx("input path is too long: %s",
optarg);
err++;
}
} }
break; break;
case 'o': case 'o':
@ -1907,8 +1917,13 @@ main(int argc, char *argv[])
vid.mode |= M_OUT_FILE; vid.mode |= M_OUT_FILE;
if (ch != 'O') if (ch != 'O')
vid.mode &= ~M_OUT_XV; vid.mode &= ~M_OUT_XV;
snprintf(vid.iofile, sizeof(vid.iofile), len = strlcpy(vid.iofile, optarg,
optarg); sizeof(vid.iofile));
if (len >= sizeof(vid.iofile)) {
warnx("output path is too long: %s",
optarg);
err++;
}
} }
break; break;
case 'q': case 'q':