From e240f49073d7f04eb513d4665b118ed8cdfdb864 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 6 Sep 2011 06:55:30 +0000 Subject: * transcode.c (load_transcoder_entry): concatenate paths directly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- transcode.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'transcode.c') diff --git a/transcode.c b/transcode.c index 482fb6bf17..44bed8b2d2 100644 --- a/transcode.c +++ b/transcode.c @@ -369,16 +369,19 @@ load_transcoder_entry(transcoder_entry_t *entry) if (entry->lib) { const char *lib = entry->lib; size_t len = strlen(lib); - char path[sizeof(transcoder_lib_prefix) + MAX_TRANSCODER_LIBNAME_LEN]; + size_t total_len = sizeof(transcoder_lib_prefix) - 1 + len; + char *path; VALUE fn; entry->lib = NULL; if (len > MAX_TRANSCODER_LIBNAME_LEN) return NULL; + fn = rb_str_new(0, total_len); + path = RSTRING_PTR(fn); memcpy(path, transcoder_lib_prefix, sizeof(transcoder_lib_prefix) - 1); - memcpy(path + sizeof(transcoder_lib_prefix) - 1, lib, len + 1); - fn = rb_str_new2(path); + memcpy(path + sizeof(transcoder_lib_prefix) - 1, lib, len); + rb_str_set_len(fn, total_len); FL_UNSET(fn, FL_TAINT|FL_UNTRUSTED); OBJ_FREEZE(fn); if (!rb_require_safe(fn, rb_safe_level())) -- cgit v1.2.3