aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-27 17:12:24 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-27 17:12:24 +0000
commit0d9710692e49d8d42bd02997f62cf325f8f1812b (patch)
treebbe07d01bdd80222963ce715d139dcdb5a87700c
parent2828593e1adb682d802d40570cadd0ff1b246bb2 (diff)
downloadruby-0d9710692e49d8d42bd02997f62cf325f8f1812b.tar.gz
* vm_insnhelper.c (unknown_keyword_error): add GC guard to prevent
intermediate object from GC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_insnhelper.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ff9722311..4b8c5260be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 28 02:08:04 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * vm_insnhelper.c (unknown_keyword_error): add GC guard to prevent
+ intermediate object from GC.
+
Tue Dec 27 22:34:54 2011 Shota Fukumori <sorah@tubusu.net>
* lib/test/unit.rb (Worker#close): "closing IO if IO is closed"
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 1fdf330632..78d6b8a083 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -146,6 +146,7 @@ unknown_keyword_error(const rb_iseq_t *iseq, VALUE hash)
if (TYPE(keys) != T_ARRAY) rb_raise(rb_eArgError, "unknown keyword");
msg = RARRAY_LEN(keys) == 1 ? "unknown keyword: %s" : "unknown keywords: %s";
keys = rb_funcall(keys, rb_intern("join"), 1, sep);
+ RB_GC_GUARD(keys);
rb_raise(rb_eArgError, msg, RSTRING_PTR(keys));
}