X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fpasswd%2Fgetgr_r.c;h=1dc5f7e0e38df9398eaadbdb5e0291a546b599b8;hb=1701e4f3d46b14c4c4be8a46e64f8eaf15a5c061;hp=5b1333e3b14f9c347dc36d1985d1c32c7c71bc6e;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c
index 5b1333e3..1dc5f7e0 100644
--- a/src/passwd/getgr_r.c
+++ b/src/passwd/getgr_r.c
@@ -1,4 +1,5 @@
 #include "pwf.h"
+#include <pthread.h>
 
 #define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
 
@@ -11,9 +12,15 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
 	size_t nmem = 0;
 	int rv = 0;
 	size_t i;
+	int cs;
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
 
 	f = fopen("/etc/group", "rb");
-	if (!f) return errno;
+	if (!f) {
+		rv = errno;
+		goto done;
+	}
 
 	*res = 0;
 	while (__getgrent_a(f, gr, &line, &len, &mem, &nmem)) {
@@ -39,6 +46,8 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
  	free(mem);
  	free(line);
 	fclose(f);
+done:
+	pthread_setcancelstate(cs, 0);
 	return rv;
 }
 
@@ -47,7 +56,7 @@ int getgrnam_r(const char *name, struct group *gr, char *buf, size_t size, struc
 	return getgr_r(name, 0, gr, buf, size, res);
 }
 
-int getgruid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
+int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
 {
 	return getgr_r(0, gid, gr, buf, size, res);
 }