archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 39353: [Backport #8057]

Browse source 
* 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
This commit is contained in:
nagachika 2013-03-09 12:26:17 +00:00
parent efbc2d7f0f
commit 54281916e9
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Mar 9 21:25:45 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* file.c (rb_group_member): added an error check. SUS says,
getgroups(small_value) may return EINVAL.
Sat Mar 9 21:23:36 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sat Mar 9 21:23:36 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* process.c (RB_MAX_GROUPS): moved to * process.c (RB_MAX_GROUPS): moved to

4
file.c
View file

@ -1036,7 +1036,7 @@ rb_group_member(GETGROUPS_T gid)
while (groups <= RB_MAX_GROUPS) { while (groups <= RB_MAX_GROUPS) {
gary = ALLOCV_N(GETGROUPS_T, v, groups); gary = ALLOCV_N(GETGROUPS_T, v, groups);
anum = getgroups(groups, gary); anum = getgroups(groups, gary);
if (anum != groups) if (anum != -1 && anum != groups)
break; break;
groups *= 2; groups *= 2;
if (v) { if (v) {
@ -1044,6 +1044,8 @@ rb_group_member(GETGROUPS_T gid)
v = 0; v = 0;
} }
} }
if (anum == -1)
return FALSE;
while (--anum >= 0) { while (--anum >= 0) {
if (gary[anum] == gid) { if (gary[anum] == gid) {

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-09" #define RUBY_RELEASE_DATE "2013-03-09"
#define RUBY_PATCHLEVEL 22 #define RUBY_PATCHLEVEL 23
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3