archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r24381 from trunk into ruby_1_9_1.

Browse source 
--
* thread.c (recursive_push): need to set UNTRUST.  [ruby-dev:38997]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-08-08 15:33:20 +00:00
parent 5c4e05232e
commit dd8b1350b0
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712] * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712]

1
thread.c
View file

@ -3325,6 +3325,7 @@ recursive_push(VALUE hash, VALUE obj, VALUE paired_obj)
sym = ID2SYM(rb_frame_this_func()); sym = ID2SYM(rb_frame_this_func());
if (NIL_P(hash) || TYPE(hash) != T_HASH) { if (NIL_P(hash) || TYPE(hash) != T_HASH) {
hash = rb_hash_new(); hash = rb_hash_new();
OBJ_UNTRUST(hash);
rb_thread_local_aset(rb_thread_current(), recursive_key, hash); rb_thread_local_aset(rb_thread_current(), recursive_key, hash);
list = Qnil; list = Qnil;
} }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 268 #define RUBY_PATCHLEVEL 269
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1