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

Don't pass strings from argv[] to free(). Fixes PR 39992.

Browse Source
This commit is contained in:
dholland 2008-11-23 10:08:50 +00:00
parent 23ba00db99
commit afde5a17cd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/pax/options.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: options.c,v 1.101 2007/10/26 16:38:12 hira Exp $ */
/* $NetBSD: options.c,v 1.102 2008/11/23 10:08:50 dholland Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
__RCSID("$NetBSD: options.c,v 1.101 2007/10/26 16:38:12 hira Exp $");
__RCSID("$NetBSD: options.c,v 1.102 2008/11/23 10:08:50 dholland Exp $");
#endif
#endif /* not lint */
@ -1173,6 +1173,7 @@ tar_options(int argc, char **argv)
int sawpat = 0;
int dirisnext = 0;
char *file, *dir = NULL;
int mustfreedir = 0;
while (nincfiles || *argv != NULL) {
/*
@ -1185,6 +1186,7 @@ tar_options(int argc, char **argv)
if (nincfiles) {
file = incfiles->file;
dir = incfiles->dir;
mustfreedir = 0;
incfiles++;
nincfiles--;
} else if (strcmp(*argv, "-I") == 0) {
@ -1192,9 +1194,11 @@ tar_options(int argc, char **argv)
break;
file = *argv++;
dir = chdname;
mustfreedir = 0;
} else {
file = NULL;
dir = NULL;
mustfreedir = 0;
}
if (file != NULL) {
FILE *fp;
@ -1208,9 +1212,10 @@ tar_options(int argc, char **argv)
}
while ((str = getline(fp)) != NULL) {
if (dirisnext) {
if (dir)
if (dir && mustfreedir)
free(dir);
dir = str;
mustfreedir = 1;
dirisnext = 0;
continue;
}
@ -1222,9 +1227,10 @@ tar_options(int argc, char **argv)
}
if (strncmp(str, "-C ", 3) == 0) {
havechd++;
if (dir)
if (dir && mustfreedir)
free(dir);
dir = strdup(str + 3);
mustfreedir = 1;
free(str);
continue;
}
@ -1235,7 +1241,7 @@ tar_options(int argc, char **argv)
/* Bomb if given -C w/out a dir. */
if (dirisnext)
tar_usage();
if (dir)
if (dir && mustfreedir)
free(dir);
if (strcmp(file, "-") != 0)
fclose(fp);