From df9e11bb063446df760e8f7c62ea5eb6ba3faa34 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 18 Apr 2011 21:17:03 -0400 Subject: protect ftw and nftw against cancellation --- src/misc/nftw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/misc/nftw.c b/src/misc/nftw.c index 1b94ac15..63d6aff5 100644 --- a/src/misc/nftw.c +++ b/src/misc/nftw.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "libc.h" struct history @@ -103,6 +104,7 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, struct FTW *), int fd_limit, int flags) { + int r, cs; size_t l; char pathbuf[PATH_MAX+1]; @@ -115,7 +117,10 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str } memcpy(pathbuf, path, l+1); - return do_nftw(pathbuf, fn, fd_limit, flags, NULL); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); + r = do_nftw(pathbuf, fn, fd_limit, flags, NULL); + pthread_setcancelstate(cs, 0); + return r; } LFS64(nftw); -- cgit v1.2.1