Skip to content

Fix xinstall segfault on Linux #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sch-LikA wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix xinstall segfault on Linux #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions tools/binstall/xinstall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,31 @@ main(int argc, char *argv[])
}

if (dodest) {
char *dest = dirname(argv[argc - 1]);
if (dest == NULL)
char *destcopy = strdup(argv[argc - 1]);
char *dest, *destdir;
if (destcopy == NULL)
err(1, "strdup");
dest = dirname(destcopy);
if (dest == NULL) {
free(destcopy);
errx(1, "cannot determine dirname");
}
/*
* dirname() may return a pointer to static storage or
* modify destcopy in place. Make a copy of the result
* since install_dir() modifies its argument.
*/
destdir = strdup(dest);
free(destcopy);
if (destdir == NULL)
err(1, "strdup");
/*
* When -D is passed, do not chmod the directory with the mode set for
* the target file. If more restrictive permissions are required then
* '-d -m' ought to be used instead.
*/
install_dir(dest, 0755);
install_dir(destdir, 0755);
free(destdir);
}

no_target = stat(to_name = argv[argc - 1], &to_sb);
Expand Down