From 9009456c1ad07f8cd781c21c9d63bde354da7d41 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 6 Feb 2019 23:18:11 -0500 Subject: Fix -nouser/-nogroup error handling The proper way to check for nonexistent users/groups is to set errno to 0 before the get{grg,pwu}id() call, and check it afterwards. On doing this, it becomes obvious that the call can fail if bftw() is using all the available FDs, so give them some ephemeral FDs. It would be ideal to read the user/group table only once, but this fixes the bug for now. --- eval.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index de57b9f..e05aff1 100644 --- a/eval.c +++ b/eval.c @@ -369,7 +369,16 @@ bool eval_nogroup(const struct expr *expr, struct eval_state *state) { return false; } - return getgrgid(statbuf->gid) == NULL; + errno = 0; + if (getgrgid(statbuf->gid) == NULL) { + if (errno == 0) { + return true; + } else { + eval_report_error(state); + } + } + + return false; } /** @@ -381,7 +390,16 @@ bool eval_nouser(const struct expr *expr, struct eval_state *state) { return false; } - return getpwuid(statbuf->uid) == NULL; + errno = 0; + if (getpwuid(statbuf->uid) == NULL) { + if (errno == 0) { + return true; + } else { + eval_report_error(state); + } + } + + return false; } /** -- cgit v1.2.3