From 0035d04bc088fdcc304dfa615618356ee668e453 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Aug 2008 08:17:27 +0000
Subject: * 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
---
 transcode.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'transcode.c')

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;
-- 
cgit