diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-24 20:06:32 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-24 20:06:32 +0000 |
| commit | 76940d8a763a45defd36a26bec4159c500d026e4 (patch) | |
| tree | dcb470ea28150336a808c7afc23407f17109f83e /ext/nkf | |
| parent | 58d3ef7778a1bfb9116f282f9cc70224cd943217 (diff) | |
merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957]
ext: check if null byte is contained
[ruby-dev:50267] [Bug #13953]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@61456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf')
| -rw-r--r-- | ext/nkf/nkf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 9613a925ce..c958c91753 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -137,8 +137,7 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src) { VALUE tmp; reinit(); - StringValue(opt); - nkf_split_options(RSTRING_PTR(opt)); + nkf_split_options(StringValueCStr(opt)); if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given"); switch (nkf_enc_to_index(output_encoding)) { @@ -153,8 +152,7 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src) incsize = INCSIZE; input_ctr = 0; - StringValue(src); - input = (unsigned char *)RSTRING_PTR(src); + input = (unsigned char *)StringValuePtr(src); i_len = RSTRING_LENINT(src); tmp = rb_str_new(0, i_len*3 + 10); @@ -195,8 +193,7 @@ rb_nkf_guess(VALUE obj, VALUE src) reinit(); input_ctr = 0; - StringValue(src); - input = (unsigned char *)RSTRING_PTR(src); + input = (unsigned char *)StringValuePtr(src); i_len = RSTRING_LENINT(src); guess_f = TRUE; |