d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix segfault if distfetch and distextract binaries are run standalone

Browse Source 
without the DISTRIBUTIONS environment variable set.

PR:		bin/165492
Submitted by:	Fernando Apesteguia
MFC after:	4 days
This commit is contained in:
Nathan Whitehorn 2012-02-26 22:09:21 +00:00
parent 2f42a9bf0d
commit bfd258f74e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232200
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/bsdinstall/distextract/distextract.c
View File

@ -38,9 +38,16 @@ static int extract_files(int nfiles, const char **files);
int
main(void)
{
char *diststring = strdup(getenv("DISTRIBUTIONS"));
char *diststring;
const char **dists;
int i, retval, ndists = 0;
if (getenv("DISTRIBUTIONS") == NULL) {
fprintf(stderr, "DISTRIBUTIONS variable is not set\n");
return (1);
}
diststring = strdup(getenv("DISTRIBUTIONS"));
for (i = 0; diststring[i] != 0; i++)
if (isspace(diststring[i]) && !isspace(diststring[i+1]))
ndists++;

9
usr.sbin/bsdinstall/distfetch/distfetch.c
View File

@ -37,9 +37,16 @@ static int fetch_files(int nfiles, char **urls);
int
main(void)
{
char *diststring = strdup(getenv("DISTRIBUTIONS"));
char *diststring;
char **urls;
int i, nfetched, ndists = 0;
if (getenv("DISTRIBUTIONS") == NULL) {
fprintf(stderr, "DISTRIBUTIONS variable is not set\n");
return (1);
}
diststring = strdup(getenv("DISTRIBUTIONS"));
for (i = 0; diststring[i] != 0; i++)
if (isspace(diststring[i]) && !isspace(diststring[i+1]))
ndists++;