From 7e091d24ce6e478ba92b4c1188be0a795e0fc151 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 27 Jan 2015 04:09:04 +0000 Subject: cstr.c: nil iff terminated validly * ext/-test-/string/cstr.c (bug_str_cstr_term_char): return nil only when terminated validly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/-test-/string/cstr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/-test-') diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c index 81edbb0b79..ba2e46bc55 100644 --- a/ext/-test-/string/cstr.c +++ b/ext/-test-/string/cstr.c @@ -36,8 +36,9 @@ bug_str_cstr_term_char(VALUE str) } else { c = rb_enc_mbc_to_codepoint(s, s + len, enc); + if (!c) return Qnil; } - return c ? rb_enc_uint_chr((unsigned int)c, enc) : Qnil; + return rb_enc_uint_chr((unsigned int)c, enc); } static VALUE -- cgit v1.2.3