1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* transcode.c (rb_declare_transcoder, load_transcoder_entry): no

Browse Source 
longer need to limit the length of transcoder library name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-09-07 22:44:27 +00:00
parent 7dc427f7ed
commit 6572bd3ce9
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Sep 8 07:44:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* transcode.c (rb_declare_transcoder, load_transcoder_entry): no
longer need to limit the length of transcoder library name.
Thu Sep 8 07:36:36 2011 NARUSE, Yui <naruse@ruby-lang.org> Thu Sep 8 07:36:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/syck/lib/syck/types.rb: use toplevel Syck. * ext/syck/lib/syck/types.rb: use toplevel Syck.

20
transcode.c
View File

@ -227,15 +227,13 @@ declare_transcoder(const char *sname, const char *dname, const char *lib)
entry->lib = lib; entry->lib = lib;
} }
#define MAX_TRANSCODER_LIBNAME_LEN 64
static const char transcoder_lib_prefix[] = "enc/trans/"; static const char transcoder_lib_prefix[] = "enc/trans/";
void void
rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib) rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib)
{ {
if (!lib || strlen(lib) > MAX_TRANSCODER_LIBNAME_LEN) { if (!lib) {
rb_raise(rb_eArgError, "invalid library name - %s", rb_raise(rb_eArgError, "invalid library name - (null)");
lib ? lib : "(null)");
} }
declare_transcoder(enc1, enc2, lib); declare_transcoder(enc1, enc2, lib);
} }
@ -367,18 +365,14 @@ load_transcoder_entry(transcoder_entry_t *entry)
return entry->transcoder; return entry->transcoder;
if (entry->lib) { if (entry->lib) {
const char *lib = entry->lib; const char *const lib = entry->lib;
size_t len = strlen(lib); const size_t len = strlen(lib);
size_t total_len = sizeof(transcoder_lib_prefix) - 1 + len; const size_t total_len = sizeof(transcoder_lib_prefix) - 1 + len;
char *path; const VALUE fn = rb_str_new(0, total_len);
VALUE fn; char *const path = RSTRING_PTR(fn);
entry->lib = NULL; 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, transcoder_lib_prefix, sizeof(transcoder_lib_prefix) - 1);
memcpy(path + sizeof(transcoder_lib_prefix) - 1, lib, len); memcpy(path + sizeof(transcoder_lib_prefix) - 1, lib, len);
rb_str_set_len(fn, total_len); rb_str_set_len(fn, total_len);