From 4948a24df21c1e80bedc1f302547c9cb26e4dbfe Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 1 Feb 2012 23:51:19 -0500 Subject: make passwd/group functions safe against cancellation in stdio these changes are a prerequisite to making stdio cancellable. --- src/passwd/getgrent_a.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/passwd/getgrent_a.c') diff --git a/src/passwd/getgrent_a.c b/src/passwd/getgrent_a.c index 7c63c57b..780560dd 100644 --- a/src/passwd/getgrent_a.c +++ b/src/passwd/getgrent_a.c @@ -1,16 +1,19 @@ #include "pwf.h" +#include struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem) { ssize_t l; char *s, *mems; size_t i; - + int cs; + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); for (;;) { if ((l=getline(line, size, f)) < 0) { free(*line); *line = 0; - return 0; + gr = 0; + goto end; } line[0][l-1] = 0; @@ -46,5 +49,7 @@ struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, mem[0][0] = 0; } gr->gr_mem = *mem; +end: + pthread_setcancelstate(cs, 0); return gr; } -- cgit v1.2.1