ruby-changes:19471
From: yugui <ko1@a...>
Date: Thu, 12 May 2011 06:26:08 +0900 (JST)
Subject: [ruby-changes:19471] Ruby:r31512 (ruby_1_9_2): merges r30820 from trunk into ruby_1_9_2.
yugui 2011-05-12 06:23:31 +0900 (Thu, 12 May 2011) New Revision: 31512 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31512 Log: merges r30820 from trunk into ruby_1_9_2. -- * process.c (proc_setgroups): add GC guard to prevent intermediate variable from GC. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/process.c branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 31511) +++ ruby_1_9_2/ChangeLog (revision 31512) @@ -1,3 +1,8 @@ +Tue Feb 8 01:00:21 2011 CHIKANAGA Tomoyuki <nagachika00@g...> + + * process.c (proc_setgroups): add GC guard to prevent intermediate + variable from GC. + Mon Feb 7 22:56:16 2011 CHIKANAGA Tomoyuki <nagachika00@g...> * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of Index: ruby_1_9_2/process.c =================================================================== --- ruby_1_9_2/process.c (revision 31511) +++ ruby_1_9_2/process.c (revision 31512) @@ -4464,9 +4464,11 @@ } else { gr = getgrnam(RSTRING_PTR(tmp)); - if (gr == NULL) + if (gr == NULL) { + RB_GC_GUARD(tmp); rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(tmp)); + } groups[i] = gr->gr_gid; } } Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 31511) +++ ruby_1_9_2/version.h (revision 31512) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 196 +#define RUBY_PATCHLEVEL 197 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/