summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-07 16:01:57 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-07 16:01:57 +0000
commit012e60f61c99ff43686e16711e12b7b09493614b (patch)
tree73207b249042fbe4fa70ecae88763f360d1f10a0
parent5f3e191f958a1c49603da8f6275e91fb0ec84ec4 (diff)
* process.c (proc_setgroups): add GC guard to prevent intermediate
variable from GC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--process.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 46747c1300..4da000a17e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 8 01:00:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * process.c (proc_setgroups): add GC guard to prevent intermediate
+ variable from GC.
+
Tue Feb 8 00:56:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg, ruby-in-here-doc-p): tell
diff --git a/process.c b/process.c
index f957d24613..df0350e3f2 100644
--- a/process.c
+++ b/process.c
@@ -4608,9 +4608,11 @@ proc_setgroups(VALUE obj, VALUE ary)
}
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;
}
}