diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:33:20 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:33:20 +0000 |
commit | 1443b2a6e13ba1a6c79a8b07c72e0a9355fa0506 (patch) | |
tree | 8515c055427f55c89ec889a8d0d6220ad11b5ef0 | |
parent | d8d4f18af86a10763f25e54155f0f0953453259a (diff) | |
download | ruby-1443b2a6e13ba1a6c79a8b07c72e0a9355fa0506.tar.gz ruby-1443b2a6e13ba1a6c79a8b07c72e0a9355fa0506.tar.xz ruby-1443b2a6e13ba1a6c79a8b07c72e0a9355fa0506.zip |
merges r24381 from trunk into ruby_1_9_1.
--
* thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | thread.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Aug 4 05:43:03 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997] + Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712] @@ -3325,6 +3325,7 @@ recursive_push(VALUE hash, VALUE obj, VALUE paired_obj) sym = ID2SYM(rb_frame_this_func()); if (NIL_P(hash) || TYPE(hash) != T_HASH) { hash = rb_hash_new(); + OBJ_UNTRUST(hash); rb_thread_local_aset(rb_thread_current(), recursive_key, hash); list = Qnil; } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 268 +#define RUBY_PATCHLEVEL 269 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |