ruby-changes:12750
From: yugui <ko1@a...>
Date: Sun, 9 Aug 2009 15:52:40 +0900 (JST)
Subject: [ruby-changes:12750] Ruby:r24462 (ruby_1_9_1): merges r24371 from trunk into ruby_1_9_1.
yugui 2009-08-09 00:32:51 +0900 (Sun, 09 Aug 2009) New Revision: 24462 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24462 Log: merges r24371 from trunk into ruby_1_9_1. -- * thread.c (recursive_push): untrust internal hash to prevent unexpected SecurityError. a patch from Kazuhiro NISHIYAMA. Fix: #1864 [ruby-dev:38982] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/thread.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24461) +++ ruby_1_9_1/ChangeLog (revision 24462) @@ -1,3 +1,9 @@ +Mon Aug 3 18:12:54 2009 Yukihiro Matsumoto <matz@r...> + + * thread.c (recursive_push): untrust internal hash to prevent + unexpected SecurityError. a patch from Kazuhiro NISHIYAMA. + Fix: #1864 [ruby-dev:38982] + Mon Aug 3 17:06:05 2009 Yukihiro Matsumoto <matz@r...> * lib/README: updated. a patch from Daniel Bovensiepen. Index: ruby_1_9_1/thread.c =================================================================== --- ruby_1_9_1/thread.c (revision 24461) +++ ruby_1_9_1/thread.c (revision 24462) @@ -3333,6 +3333,7 @@ } if (NIL_P(list) || TYPE(list) != T_HASH) { list = rb_hash_new(); + OBJ_UNTRUST(list); rb_hash_aset(hash, sym, list); } if (!paired_obj) { @@ -3345,6 +3346,7 @@ if (TYPE(pair_list) != T_HASH){ VALUE other_paired_obj = pair_list; pair_list = rb_hash_new(); + OBJ_UNTRUST(pair_list); rb_hash_aset(pair_list, other_paired_obj, Qtrue); rb_hash_aset(list, obj, pair_list); } Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24461) +++ ruby_1_9_1/version.h (revision 24462) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 266 +#define RUBY_PATCHLEVEL 267 #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/