diff options
| -rw-r--r-- | find/tree.c | 14 | ||||
| -rwxr-xr-x | tests/find/files0-from.sh | 13 |
2 files changed, 27 insertions, 0 deletions
diff --git a/find/tree.c b/find/tree.c index 1b33edc7..39c1a4ce 100644 --- a/find/tree.c +++ b/find/tree.c @@ -128,6 +128,14 @@ get_expr (struct predicate **input, break; case CLOSE_PAREN: + if (prev_pred == NULL) + { + /* Happens with e.g. "find -files0-from - ')' -print" */ + die (EXIT_FAILURE, 0, + _("invalid expression: expected expression before closing parentheses '%s'."), + this_pred->p_name); + } + if ((UNI_OP == prev_pred->p_type || BI_OP == prev_pred->p_type) && !this_pred->artificial) @@ -180,6 +188,12 @@ get_expr (struct predicate **input, *input = (*input)->pred_next; if ( (*input)->p_type == CLOSE_PAREN ) { + if (prev_pred->artificial) + { + die (EXIT_FAILURE, 0, + _("invalid expression: expected expression before closing parentheses '%s'."), + (*input)->p_name); + } die (EXIT_FAILURE, 0, _("invalid expression; empty parentheses are not allowed.")); } diff --git a/tests/find/files0-from.sh b/tests/find/files0-from.sh index b930a999..bf54a1b2 100755 --- a/tests/find/files0-from.sh +++ b/tests/find/files0-from.sh @@ -108,6 +108,19 @@ cat /dev/null | returns_ 1 find -files0-from - > out 2> err || fail=1 compare /dev/null out || fail=1 grep 'file with starting points is empty:.*standard input' err || fail=1 +# With the -files0-from option, now a closing paren could be passed as first +# predicate (without, it is treated as a starting point). Ensure that find(1) +# handles this invalid invocation. +returns_ 1 find -files0-from - ')' -print < /dev/null > out 2> err || fail=1 +compare /dev/null out || fail=1 +grep "inv.*: expected expression before closing parentheses" err || fail=1 + +# Likewise in the case find(1) implicitly adds the default action via the +# artificial '( user-expr ) -print' construct. +returns_ 1 find -files0-from - ')' < /dev/null > out 2> err || fail=1 +compare /dev/null out || fail=1 +grep "inv.*: expected expression before closing parentheses" err || fail=1 + # Now a regular case: 2 files: expect the same output. touch a b || framework_failure_ printf '%s\0' a b > in || framework_failure_ |