diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 04:28:12 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 04:28:12 +0000 |
| commit | 29bbaacd08c8059c24f72c7e250024d2bbfa0a5b (patch) | |
| tree | a2494fcca72cd877ce834db125db680b3c2fc42d | |
| parent | 47cb9c89dfabc25b75cc8647652c5ba88b943b6f (diff) | |
| download | ruby-29bbaacd08c8059c24f72c7e250024d2bbfa0a5b.tar.gz ruby-29bbaacd08c8059c24f72c7e250024d2bbfa0a5b.tar.xz ruby-29bbaacd08c8059c24f72c7e250024d2bbfa0a5b.zip | |
* transcode.c (str_transcode): check last hash only if 0 < argc.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | transcode.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Aug 24 13:27:42 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (str_transcode): check last hash only if 0 < argc. + Sun Aug 24 12:22:15 2008 Tanaka Akira <akr@fsij.org> * include/ruby/encoding.h (rb_econv_substr_append): renamed from diff --git a/transcode.c b/transcode.c index 1ba30c825..c087716b4 100644 --- a/transcode.c +++ b/transcode.c @@ -1687,7 +1687,10 @@ str_transcode(int argc, VALUE *argv, VALUE *self) VALUE opt; int options = 0; - opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash"); + if (0 < argc) + opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash"); + else + opt = Qnil; if (!NIL_P(opt)) { VALUE v; |