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

Fix SIGINFO race causing final results to be lost to stderr.

Browse Source 
If a SIGINFO comes in after the file is read then the 'siginfo' flag is set to
1 and the next call to show_cnt() (at exit) would print the data to stderr
rather than the expected stdout.

This was found with spamming Poudriere with SIGINFO which caused a 'wc -l'
execution to return no data rather than an expected number.

MFC after:	2 weeks
This commit is contained in:
Bryan Drewery 2015-04-16 21:44:35 +00:00
parent 43d4f8c4c6
commit 8ded906d2a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/wc/wc.c
View File

@ -76,6 +76,14 @@ siginfo_handler(int sig __unused)
siginfo = 1;
}
static void
reset_siginfo(void)
{
signal(SIGINFO, SIG_DFL);
siginfo = 0;
}
int
main(int argc, char *argv[])
{
@ -229,6 +237,7 @@ cnt(const char *file)
} else
tmpll++;
}
reset_siginfo();
tlinect += linect;
if (dochar)
tcharct += charct;
@ -251,6 +260,7 @@ cnt(const char *file)
return (1);
}
if (S_ISREG(sb.st_mode)) {
reset_siginfo();
charct = sb.st_size;
show_cnt(file, linect, wordct, charct, llct);
tcharct += charct;
@ -311,6 +321,7 @@ word: gotsp = 1;
}
}
}
reset_siginfo();
if (domulti && MB_CUR_MAX > 1)
if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned)
xo_warn("%s", file != NULL ? file : "stdin");