From 19a127d0cbb9a94b530add65f118252e94551bb9 Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 7 Mar 2011 12:35:45 +0000 Subject: * process.c (proc_setgroups): replace getgrnam() with getgrnam_r() because getgrnam() isn't thread safe. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- process.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'process.c') diff --git a/process.c b/process.c index 3da3543e2b..134ebfac5c 100644 --- a/process.c +++ b/process.c @@ -4614,7 +4614,12 @@ proc_setgroups(VALUE obj, VALUE ary) { size_t ngroups, i; rb_gid_t *groups; - struct group *gr; + long getgr_buf_len = sysconf(_SC_GETGR_R_SIZE_MAX); + char* getgr_buf; + + if (getgr_buf_len < 0) + getgr_buf_len = 4096; + getgr_buf = ALLOCA_N(char, getgr_buf_len); Check_Type(ary, T_ARRAY); @@ -4632,18 +4637,24 @@ proc_setgroups(VALUE obj, VALUE ary) } else { VALUE tmp = rb_check_string_type(g); + struct group grp; + struct group *p; + int ret; if (NIL_P(tmp)) { groups[i] = NUM2GIDT(g); } else { - gr = getgrnam(RSTRING_PTR(tmp)); - if (gr == NULL) { - RB_GC_GUARD(tmp); + StringValue(tmp); + + ret = getgrnam_r(RSTRING_PTR(tmp), &grp, getgr_buf, getgr_buf_len, &p); + if (ret) + rb_sys_fail("getgrnam_r"); + if (p == NULL) { rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(tmp)); } - groups[i] = gr->gr_gid; + groups[i] = grp.gr_gid; } } } -- cgit v1.2.3