summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-26 03:48:41 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-26 03:48:41 (GMT)
commit9a7e4bf9ea027f6ac5116743a3006c84c7441f50 (patch)
tree1282f4f1ddc777508b12f430ef9531bc3ad5b75c /transcode.c
parent9f1c009497431a5fd161eb530f8f1ccfbe0acac3 (diff)
transcode.c: fix race condition
* 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
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/transcode.c b/transcode.c
index 17d406e..b9d0adc 100644
--- a/transcode.c
+++ b/transcode.c
@@ -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)