[PATCH] expand: Check d_type in expmeta before recursing

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If the directory pointer is not a directory or symlink, do not
recurse into expmeta.

Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
---
 src/expand.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/expand.c b/src/expand.c
index 345c498..527ce7c 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -1722,6 +1722,8 @@ static char *expmeta(char *name, unsigned name_len, size_t expdir_len)
 
 		if (*dname == '.' && !matchdot)
 			goto check_int;
+		if (c && dp->d_type != DT_DIR && dp->d_type != DT_LNK)
+			goto check_int;
 		len = strlen(dname) + 1;
 		p = dname;
 		if (!FNMATCH_IS_ENABLED) {
-- 
2.39.2

-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt




[Index of Archives]     [LARTC]     [Bugtraq]     [Yosemite Forum]     [Photo]

  Powered by Linux