summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-09 12:26:17 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-09 12:26:17 +0000
commit54281916e9623b132b6745bdc9ee9a397eff7398 (patch)
tree857f80959a6cc9e6c10cc266d69ec99832f441f7 /file.c
parentefbc2d7f0fbe316892b0eb984390458ba6d829ea (diff)
merge revision(s) 39353: [Backport #8057]
* file.c (rb_group_member): added an error check. SUS says, getgroups(small_value) may return EINVAL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/file.c b/file.c
index 7d53f8d98f..44c019d7ae 100644
--- a/file.c
+++ b/file.c
@@ -1036,7 +1036,7 @@ rb_group_member(GETGROUPS_T gid)
while (groups <= RB_MAX_GROUPS) {
gary = ALLOCV_N(GETGROUPS_T, v, groups);
anum = getgroups(groups, gary);
- if (anum != groups)
+ if (anum != -1 && anum != groups)
break;
groups *= 2;
if (v) {
@@ -1044,6 +1044,8 @@ rb_group_member(GETGROUPS_T gid)
v = 0;
}
}
+ if (anum == -1)
+ return FALSE;
while (--anum >= 0) {
if (gary[anum] == gid) {