From 538e4b2054e9802ebc860943e0a43baf2ee46741 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 31 Jan 2017 21:01:14 -0500 Subject: Don't trust st_size when reading symlinks Linux /proc, for example, reports a st_size of 0 for everything. It's nice to be able to use -lname on them anyway. --- eval.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 6a3da7a..4494cff 100644 --- a/eval.c +++ b/eval.c @@ -599,23 +599,12 @@ bool eval_lname(const struct expr *expr, struct eval_state *state) { goto done; } - size_t size = statbuf->st_size + 1; - name = malloc(size); + name = xreadlinkat(ftwbuf->at_fd, ftwbuf->at_path, statbuf->st_size); if (!name) { eval_error(state); goto done; } - ssize_t len = readlinkat(ftwbuf->at_fd, ftwbuf->at_path, name, size); - if (len < 0) { - eval_error(state); - goto done; - } else if (len >= size) { - goto done; - } - - name[len] = '\0'; - ret = fnmatch(expr->sdata, name, expr->idata) == 0; done: -- cgit v1.2.3