From 7e58885f0a56202349291ba738efe6a1d0dc531e Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 12 Sep 2008 17:53:26 +0000 Subject: [PATCH] * transcode.c (rb_econv_prepare_opts): initialize *opt and return 0 if opthash is nil. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ transcode.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78a7b46ac4..c934e188a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 13 02:50:34 2008 Tanaka Akira + + * transcode.c (rb_econv_prepare_opts): initialize *opt and return 0 + if opthash is nil. + Sat Sep 13 02:29:19 2008 Tanaka Akira * enc/trans/escape.trans: transcoder name renamed to use underscore. diff --git a/transcode.c b/transcode.c index 3dfca27d01..e7c66ff425 100644 --- a/transcode.c +++ b/transcode.c @@ -2304,8 +2304,10 @@ rb_econv_prepare_opts(VALUE opthash, VALUE *opts) { int ecflags; VALUE newhash = Qnil; - if (NIL_P(opthash)) - return Qnil; + if (NIL_P(opthash)) { + *opts = Qnil; + return 0; + } ecflags = econv_opts(opthash); if ((ecflags & ECONV_INVALID_MASK) == ECONV_INVALID_REPLACE ||