emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stat: fix option -Z segv (bug 1454)

Browse Source
This commit is contained in:
Denis Vlasenko 2007-08-09 08:10:13 +00:00
parent 22a80d1e7d
commit 501bfe2630
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
coreutils/stat.c
View File

@ -342,8 +342,11 @@ static bool do_statfs(char const *filename, char const *format)
security_context_t scontext = NULL;
if (option_mask32 & OPT_SELINUX) {
if ((option_mask32 & OPT_DEREFERENCE ? lgetfilecon(filename, scontext):
getfilecon(filename, scontext))< 0) {
if ((option_mask32 & OPT_DEREFERENCE
? lgetfilecon(filename, &scontext)
: getfilecon(filename, &scontext)
) < 0
) {
bb_perror_msg(filename);
return 0;
}
@ -448,9 +451,12 @@ static bool do_stat(char const *filename, char const *format)
security_context_t scontext = NULL;
if (option_mask32 & OPT_SELINUX) {
if ((option_mask32 & OPT_DEREFERENCE ? lgetfilecon(filename, scontext):
getfilecon(filename, scontext))< 0) {
bb_perror_msg (filename);
if ((option_mask32 & OPT_DEREFERENCE
? lgetfilecon(filename, &scontext)
: getfilecon(filename, &scontext)
) < 0
) {
bb_perror_msg(filename);
return 0;
}
}

2
libbb/make_directory.c
View File

@ -98,6 +98,6 @@ int bb_make_directory (char *path, long mode, int flags)
} while (1);
bb_perror_msg ("cannot %s directory '%s'", fail_msg, path);
bb_perror_msg("cannot %s directory '%s'", fail_msg, path);
return -1;
}