archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 59368: [Backport #13753]

Browse source 
random.c: ensure initialized

	* random.c (get_rnd, try_get_rnd): ensure initialized to get rid
	  of crash in forked processes.  [ruby-core:82100] [Bug #13753]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-08-09 10:32:37 +00:00
parent 6b330d8fb0
commit 86024f70cf
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Aug 9 19:32:17 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* random.c (get_rnd, try_get_rnd): ensure initialized to get rid
of crash in forked processes. [Bug #13753]
Wed Aug 9 19:30:34 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 9 19:30:34 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/strscan/strscan.c (strscan_aref): fix segfault after * ext/strscan/strscan.c (strscan_aref): fix segfault after

4
random.c
View file

@ -361,7 +361,7 @@ get_rnd(VALUE obj)
{ {
rb_random_t *ptr; rb_random_t *ptr;
TypedData_Get_Struct(obj, rb_random_t, &random_data_type, ptr); TypedData_Get_Struct(obj, rb_random_t, &random_data_type, ptr);
return ptr; return rand_start(ptr);
} }
static rb_random_t * static rb_random_t *
@ -371,7 +371,7 @@ try_get_rnd(VALUE obj)
return rand_start(&default_rand); return rand_start(&default_rand);
} }
if (!rb_typeddata_is_kind_of(obj, &random_data_type)) return NULL; if (!rb_typeddata_is_kind_of(obj, &random_data_type)) return NULL;
return DATA_PTR(obj); return rand_start(DATA_PTR(obj));
} }
/* :nodoc: */ /* :nodoc: */

4
test/ruby/test_rand.rb
View file

@ -453,6 +453,10 @@ END
assert_fork_status(1, bug5661) {stable.rand(4)} assert_fork_status(1, bug5661) {stable.rand(4)}
r1, r2 = *assert_fork_status(2, bug5661) {stable.rand} r1, r2 = *assert_fork_status(2, bug5661) {stable.rand}
assert_equal(r1, r2, bug5661) assert_equal(r1, r2, bug5661)
assert_fork_status(1, '[ruby-core:82100] [Bug #13753]') do
Random::DEFAULT.rand(4)
end
rescue NotImplementedError rescue NotImplementedError
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5" #define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-08-09" #define RUBY_RELEASE_DATE "2017-08-09"
#define RUBY_PATCHLEVEL 356 #define RUBY_PATCHLEVEL 357
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8