Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strfile: Check that input/output filenames don't exceed the buffer size

This commit is contained in:
nia 2020-04-29 20:45:05 +00:00
parent 3af3d2f0c8
commit 5774e6823b
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
games/fortune/strfile/strfile.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: strfile.c,v 1.38 2013/09/19 00:34:00 uwe Exp $ */ /* $NetBSD: strfile.c,v 1.39 2020/04/29 20:45:05 nia Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; static char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93";
#else #else
__RCSID("$NetBSD: strfile.c,v 1.38 2013/09/19 00:34:00 uwe Exp $"); __RCSID("$NetBSD: strfile.c,v 1.39 2020/04/29 20:45:05 nia Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif /* __NetBSD__ */ #endif /* __NetBSD__ */
@ -267,6 +267,7 @@ getargs(int argc, char **argv)
int ch; int ch;
extern int optind; extern int optind;
extern char *optarg; extern char *optarg;
size_t len;
while ((ch = getopt(argc, argv, "c:iorsx")) != -1) while ((ch = getopt(argc, argv, "c:iorsx")) != -1)
switch(ch) { switch(ch) {
@ -300,14 +301,25 @@ getargs(int argc, char **argv)
if (*argv) { if (*argv) {
Infile = *argv; Infile = *argv;
if (*++argv) if (*++argv) {
(void) strcpy(Outfile, *argv); len = strlen(*argv);
if (len >= sizeof(Outfile)) {
puts("Bad output filename");
usage();
}
(void) memcpy(Outfile, *argv, len + 1);
}
} }
if (!Infile) { if (!Infile) {
puts("No input file name"); puts("No input file name");
usage(); usage();
} }
if (*Outfile == '\0') { if (*Outfile == '\0') {
len = strlen(Infile) + sizeof(".dat");
if (len > sizeof(Outfile)) {
puts("Bad input filename");
usage();
}
(void) strcpy(Outfile, Infile); (void) strcpy(Outfile, Infile);
(void) strcat(Outfile, ".dat"); (void) strcat(Outfile, ".dat");
} }