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

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 441ccdab7..35678740a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/transcode.c b/transcode.c
index df198b119..c05bb7d82 100644
--- a/transcode.c
+++ b/transcode.c
@@ -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;