From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 19 Apr 2011 01:17:03 +0000 (-0400)
Subject: protect ftw and nftw against cancellation
X-Git-Tag: v0.7.9~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df9e11bb063446df760e8f7c62ea5eb6ba3faa34;p=oweals%2Fmusl.git

protect ftw and nftw against cancellation
---

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 <unistd.h>
 #include <string.h>
 #include <limits.h>
+#include <pthread.h>
 #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);