* transcode.c (trans_open_i): check the result of rb_transcoding_open.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-12 08:17:27 +00:00
Родитель 5b3278b74a
Коммит abef7fa890
2 изменённых файлов: 9 добавлений и 1 удалений

Просмотреть файл

@ -1,3 +1,7 @@
Tue Aug 12 17:16:58 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (trans_open_i): check the result of rb_transcoding_open.
Tue Aug 12 16:23:32 2008 Narihiro Nakamura <authorNari@gmail.com>
* gc.c (gc_profile_result): use rb_str_catf.

Просмотреть файл

@ -608,6 +608,7 @@ trans_open_i(const char *from, const char *to, int depth, void *arg)
rb_trans_t **tsp = (rb_trans_t **)arg;
rb_trans_t *ts;
int i;
rb_transcoding *tc;
if (!*tsp) {
ts = *tsp = ALLOC(rb_trans_t);
@ -627,7 +628,10 @@ trans_open_i(const char *from, const char *to, int depth, void *arg)
ts = *tsp;
}
ts->elems[depth].tc = rb_transcoding_open(from, to, 0);
ts->elems[depth].tc = tc = rb_transcoding_open(from, to, 0);
if (!tc) {
rb_raise(rb_eArgError, "transcoding open failed (from %s to %s)", from, to);
}
if (depth < ts->num_trans-1) {
int bufsize = 4096;
unsigned char *p;