diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 03:03:18 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 03:03:18 +0000 |
| commit | 486112cbca28f1899525dde697d139b41a35bf29 (patch) | |
| tree | 5ed6fb87e451aa0c442742327bf2667e8bc55d1d | |
| parent | 52d0de429600e818f6ab3ef6ddb0ce181d9efca5 (diff) | |
| download | ruby-486112cbca28f1899525dde697d139b41a35bf29.tar.gz ruby-486112cbca28f1899525dde697d139b41a35bf29.tar.xz ruby-486112cbca28f1899525dde697d139b41a35bf29.zip | |
* transcode.c (rb_econv_open): return NULL on error.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | transcode.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Aug 24 12:02:39 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (rb_econv_open): return NULL on error. + Sun Aug 24 11:40:38 2008 Tanaka Akira <akr@fsij.org> * include/ruby/encoding.h (rb_econv_open_exc): declared. diff --git a/transcode.c b/transcode.c index ce3455df0..5e14a358b 100644 --- a/transcode.c +++ b/transcode.c @@ -780,7 +780,7 @@ rb_econv_open(const char *from, const char *to, int flags) ec = rb_econv_open_by_transcoder_entries(num_trans, entries); xfree(entries); if (!ec) - rb_raise(rb_eArgError, "encoding conversion not supported (from %s to %s)", from, to); + return NULL; ec->flags = flags; ec->source_encoding_name = from; |