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

transcode.c: fix race condition

Browse source 
* transcode.c (load_transcoder_entry): fix transcoder loading race
  condition, by waiting in require.  [ruby-dev:49106] [Bug #11277]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-06-26 03:48:41 +00:00
parent 9f1c009497
commit 9a7e4bf9ea
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
transcode.c
View file

@ -370,15 +370,12 @@ load_transcoder_entry(transcoder_entry_t *entry)
char *const path = RSTRING_PTR(fn);
const int safe = rb_safe_level();
entry->lib = NULL;
memcpy(path, transcoder_lib_prefix, sizeof(transcoder_lib_prefix) - 1);
memcpy(path + sizeof(transcoder_lib_prefix) - 1, lib, len);
rb_str_set_len(fn, total_len);
FL_UNSET(fn, FL_TAINT);
OBJ_FREEZE(fn);
if (!rb_require_safe(fn, safe > 3 ? 3 : safe))
return NULL;
rb_require_safe(fn, safe > 3 ? 3 : safe);
}
if (entry->transcoder)